pytrilogy 0.0.3.0__py3-none-any.whl → 0.0.3.2__py3-none-any.whl

{pytrilogy-0.0.3.0.dist-info → pytrilogy-0.0.3.2.dist-info}/METADATA

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

{pytrilogy-0.0.3.0.dist-info → pytrilogy-0.0.3.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=NutBQIuxEOak6wIOXS3HLb_AXutozJpl1V0dd6o3D-Y,302
+trilogy/__init__.py,sha256=u47oSxZB2gBUiSNHosZXaS5uhP_ad0NBnUKDXu5UQMw,302
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=qZ1d0hoKPPV2HHCoFwPYTVB7b6bXjpWvXd3lE-zEhy8,1494
 trilogy/engine.py,sha256=yOPnR7XCjWG82Gym_LLZBkYKKJdLCvqdCyt8zguNcnM,1103
@@ -17,14 +17,14 @@ trilogy/core/functions.py,sha256=7Pq9jYSJd45L2pxT7AI-_rXVZmeLnmTPp8d1lA4z4Vk,244
 trilogy/core/graph_models.py,sha256=z17EoO8oky2QOuO6E2aMWoVNKEVJFhLdsQZOhC4fNLU,2079
 trilogy/core/internal.py,sha256=iicDBlC6nM8d7e7jqzf_ZOmpUsW8yrr2AA8AqEiLx-s,1577
 trilogy/core/optimization.py,sha256=xGO8piVsLrpqrx-Aid_Y56_5slSv4eZmlP64hCHRiEc,7957
-trilogy/core/query_processor.py,sha256=qh-72MBOpnhIrmBQW4_lLCvJS-H3Hq_vuy--mWamw7U,19336
+trilogy/core/query_processor.py,sha256=HyDxBhQsD9KX-Y7pYznlpCAW6AvI76RqPTQNa1mreoE,19450
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/models/author.py,sha256=Ai-AFBsr4sbm3T0WE3TxFwB73foGg7-uKUTyQtoBEXQ,67093
-trilogy/core/models/build.py,sha256=uy9sJUHTnsY9sdpyzA8egPENnyTU9fryCKz3p8H0b4I,55562
+trilogy/core/models/build.py,sha256=kiq31T8LtUtgmT37m617Q2MlMvQTuAxJzwb6947EiWU,56127
 trilogy/core/models/build_environment.py,sha256=8UggvlPU708GZWYPJMc_ou2r7M3TY2g69eqGvz03YX0,5528
 trilogy/core/models/core.py,sha256=yie1uuq62uOQ5fjob9NMJbdvQPrCErXUT7JTCuYRyjI,9697
 trilogy/core/models/datasource.py,sha256=c0tGxyH2WwTmAD047tr69U0a6GNVf-ug26H68yii7DA,9257
-trilogy/core/models/environment.py,sha256=E7vdrhN0DR6_UKpxRP1KB3w9_GEcCfsKffQ4uv0_CzA,24779
+trilogy/core/models/environment.py,sha256=QSl-H6nwarzKbQgNRjtwDKMJtA4F_GVQpRs-NMNt-6Q,24983
 trilogy/core/models/execute.py,sha256=ABylFQgtavjjCfFkEsFdUwfMB4UBQLHjdzQ9E67QlAE,33521
 trilogy/core/optimizations/__init__.py,sha256=EBanqTXEzf1ZEYjAneIWoIcxtMDite5-n2dQ5xcfUtg,356
 trilogy/core/optimizations/base_optimization.py,sha256=gzDOKImoFn36k7XBD3ysEYDnbnb6vdVIztUfFQZsGnM,513
@@ -32,10 +32,10 @@ trilogy/core/optimizations/inline_constant.py,sha256=lvNTIXaLNkw3HseJyXyDNk5R52d
 trilogy/core/optimizations/inline_datasource.py,sha256=AHuTGh2x0GQ8usOe0NiFncfTFQ_KogdgDl4uucmhIbI,4241
 trilogy/core/optimizations/predicate_pushdown.py,sha256=g4AYE8Aw_iMlAh68TjNXGP754NTurrDduFECkUjoBnc,9399
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/processing/concept_strategies_v3.py,sha256=StDlgfoUIeuh2IoZlRlLgkJp5hA8polgdMmOzL_wLCo,39265
+trilogy/core/processing/concept_strategies_v3.py,sha256=0rFnasSQlkXTRIfAFMHyHVux1pTQ3ryKeQds-SFSot0,40290
 trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
 trilogy/core/processing/utility.py,sha256=Oc5tLGeDDpzhbfo2ZcF8ex1kez-NcJDMcG2Lm5BjS4c,20548
-trilogy/core/processing/node_generators/__init__.py,sha256=s_YV1OYc336DuS9591259qjI_K_CtOCuhkf4t2aOgYs,733
+trilogy/core/processing/node_generators/__init__.py,sha256=o8rOFHPSo-s_59hREwXMW6gjUJCsiXumdbJNozHUf-Y,800
 trilogy/core/processing/node_generators/basic_node.py,sha256=UVsXMn6jTjm_ofVFt218jAS11s4RV4zD781vP4im-GI,3371
 trilogy/core/processing/node_generators/common.py,sha256=ZsDzThjm_mAtdQpKAg8QIJiPVZ4KuUkKyilj4eOhSDs,9439
 trilogy/core/processing/node_generators/filter_node.py,sha256=rlY7TbgjJlGhahYgdCIJpJbaSREAGVJEsyUIGaA38O0,8271
@@ -43,12 +43,13 @@ trilogy/core/processing/node_generators/group_node.py,sha256=94uoGZWvBKJ1eqjbDHC
 trilogy/core/processing/node_generators/group_to_node.py,sha256=E5bEjovSx422d_MlAUCDFdY4P2WJVp61BmWwltkhzA8,3095
 trilogy/core/processing/node_generators/multiselect_node.py,sha256=z9FQOxxUvxW31a0TckFfAvnuvU8vP1GyN224RTbXUAk,7114
 trilogy/core/processing/node_generators/node_merge_node.py,sha256=sv55oynfqgpHEpo1OEtVDri-5fywzPhDlR85qaWikvY,16195
-trilogy/core/processing/node_generators/rowset_node.py,sha256=x3rrdUkywAFiaYRk8lv-ra8KAdmBa8dLXj0FO55lz08,6213
+trilogy/core/processing/node_generators/rowset_node.py,sha256=8yeMWiyi9IFnza7qPn9YYC3WpA53weq3AY5WisIui8Y,6705
 trilogy/core/processing/node_generators/select_merge_node.py,sha256=VHCPMbnKfg7AOfoYa6PKxpNni-j5JEfliNUiltmZhds,19698
 trilogy/core/processing/node_generators/select_node.py,sha256=Y-zO0AFkTrpi2LyebjpyHU7WWANr7nKZSS9rY7DH4Wo,1888
+trilogy/core/processing/node_generators/synonym_node.py,sha256=9LHK2XHDjbyTLjmDQieskG8fqbiSpRnFOkfrutDnOTE,2258
 trilogy/core/processing/node_generators/union_node.py,sha256=zuMSmgF170vzlp2BBQEhKbqUMjVl2xQDqUB82Dhv-VU,2536
 trilogy/core/processing/node_generators/unnest_node.py,sha256=cOEKnMRzXUW3bwmiOlgn3E1-B38osng0dh2pDykwITY,2410
-trilogy/core/processing/node_generators/window_node.py,sha256=_W_bF-8nYi1fjeZ7rXg54Sf7SRDyjDOwk7S_RBoZCWM,3514
+trilogy/core/processing/node_generators/window_node.py,sha256=6KoxhmpVOTN3HGWT0FIS96xqlm2Inouw9VL2D_0kSg0,3481
 trilogy/core/processing/node_generators/select_helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/processing/node_generators/select_helpers/datasource_injection.py,sha256=GMW07bb6hXurhF0hZLYoMAKSIS65tat5hwBjvqqPeSA,6516
 trilogy/core/processing/nodes/__init__.py,sha256=DqPG3Y8vl5-UTeox6hn1EE6iwPIJpsM-XeZALHSgLZQ,5058
@@ -66,7 +67,7 @@ trilogy/core/statements/build.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 trilogy/core/statements/common.py,sha256=KxEmz2ySySyZ6CTPzn0fJl5NX2KOk1RPyuUSwWhnK1g,759
 trilogy/core/statements/execute.py,sha256=cSlvpHFOqpiZ89pPZ5GDp9Hu6j6uj-5_h21FWm_L-KM,1248
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=uvow18PxtFdabf59x0mAXbazV9bqGAfbBxcCAe8JaFs,40212
+trilogy/dialect/base.py,sha256=u00kIIl98as1QzcduiiyyoBzxRGVeBxfeO5hWlRCAJU,40222
 trilogy/dialect/bigquery.py,sha256=mKC3zoEU232h9RtIXJjqiZ72lWH8a6S28p6wAZKrAfg,2952
 trilogy/dialect/common.py,sha256=cbTo_vamdp8pj9spSjGSH-bSZpy4FpNJ12k5vMvyT2Y,3942
 trilogy/dialect/config.py,sha256=UiBY2tBbNk9owx-zxP_3lN9lErEUXhXIU_bcXA18AvU,2992
@@ -76,24 +77,24 @@ trilogy/dialect/postgres.py,sha256=VH4EB4myjIeZTHeFU6vK00GxY9c53rCBjg2mLbdaCEE,3
 trilogy/dialect/presto.py,sha256=bAxaDcLL21fivPg7hmBd3HJmd0yYJdPdwNgNA5ga7DE,3391
 trilogy/dialect/snowflake.py,sha256=wmao9p26jX5yIX5SC8sRAZTXkPGTvq6ixO693QTfhz8,2989
 trilogy/dialect/sql_server.py,sha256=IN91uEM0MpsiVAlsYC89uMQkiVn0i86B8Tst6v9uFkU,3129
-trilogy/hooks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+trilogy/hooks/__init__.py,sha256=T3SF3phuUDPLXKGRVE_Lf9mzuwoXWyaLolncR_1kY30,144
 trilogy/hooks/base_hook.py,sha256=I_l-NBMNC7hKTDx1JgHZPVOOCvLQ36m2oIGaR5EUMXY,1180
 trilogy/hooks/graph_hook.py,sha256=c-vC-IXoJ_jDmKQjxQyIxyXPOuUcLIURB573gCsAfzQ,2940
-trilogy/hooks/query_debugger.py,sha256=qds0xnW1cxH6Nv9U1L3gqSqD9OrE3TDQKEjyHyuzkFI,5558
+trilogy/hooks/query_debugger.py,sha256=1npRjww94sPV5RRBBlLqMJRaFkH9vhEY6o828MeoEcw,5583
 trilogy/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/parsing/common.py,sha256=ti_2s3EEMAz5NwmctchiB0DpVPVusTehc2l3bZQdMQI,20500
+trilogy/parsing/common.py,sha256=lZSSu6Q8HvJVB0xCYsNpoTlkCgNNEVVCwHExVBWCDO8,20524
 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=7WU9jWH8tc6PSgBo_FcDA51QuhytzPTrZYFagCRw9Ec,53869
+trilogy/parsing/parse_engine.py,sha256=rtlwl-WzcPCd5pm0WhXHwe8JGOJCuQm_EAnRj6qG93w,54318
 trilogy/parsing/render.py,sha256=o_XuQWhcwx1lD9eGVqkqZEwkmQK0HdmWWokGBtdeH4I,17837
 trilogy/parsing/trilogy.lark,sha256=EazfEvYPuvkPkNjUnVzFi0uD9baavugbSI8CyfawShk,12573
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
-pytrilogy-0.0.3.0.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.3.0.dist-info/METADATA,sha256=z1DV_FX4ZThTyGzGCqQwyg78lSPcjDyOLO3NypXMJXk,8983
-pytrilogy-0.0.3.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pytrilogy-0.0.3.0.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.3.0.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.0.dist-info/RECORD,,
+pytrilogy-0.0.3.2.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.3.2.dist-info/METADATA,sha256=buA8GqwIT8kSii6cguT2dMcbI12XMVwQDoQya9jo-Gc,8983
+pytrilogy-0.0.3.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pytrilogy-0.0.3.2.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.3.2.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.2.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.3.0"
+__version__ = "0.0.3.2"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models/build.py

@@ -242,6 +242,9 @@ class BuildGrain(BaseModel):
     components: set[str] = Field(default_factory=set)
     where_clause: Optional[BuildWhereClause] = None
 
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
     def without_condition(self):
         return BuildGrain(components=self.components)
 
@@ -1171,7 +1174,7 @@ class BuildFilterItem(BuildConceptArgs, BaseModel):
 
 class BuildRowsetLineage(BuildConceptArgs, BaseModel):
     name: str
-    derived_concepts: List[BuildConcept]
+    derived_concepts: List[str]
     select: SelectLineage | MultiSelectLineage
 
 
@@ -1222,8 +1225,8 @@ class BuildSelectLineage(BaseModel):
     limit: Optional[int] = None
     meta: Metadata = Field(default_factory=lambda: Metadata())
     grain: BuildGrain = Field(default_factory=BuildGrain)
-    where_clause: WhereClause | BuildWhereClause | None = Field(default=None)
-    having_clause: HavingClause | BuildHavingClause | None = Field(default=None)
+    where_clause: BuildWhereClause | None = Field(default=None)
+    having_clause: BuildHavingClause | None = Field(default=None)
 
     @property
     def output_components(self) -> List[BuildConcept]:
@@ -1447,7 +1450,9 @@ class Factory:
     ):
         self.grain = grain or Grain()
         self.environment = environment
-        self.local_concepts: dict[str, BuildConcept] = local_concepts or {}
+        self.local_concepts: dict[str, BuildConcept] = (
+            {} if local_concepts is None else local_concepts
+        )
 
     @singledispatchmethod
     def build(self, base):
@@ -1494,7 +1499,7 @@ class Factory:
     @build.register
     def _(self, base: Function) -> BuildFunction:
 
-        new = BuildFunction(
+        new = BuildFunction.model_construct(
             operator=base.operator,
             arguments=[self.build(c) for c in base.arguments],
             output_datatype=base.output_datatype,
@@ -1515,14 +1520,14 @@ class Factory:
 
     @build.register
     def _(self, base: CaseWhen) -> BuildCaseWhen:
-        return BuildCaseWhen(
+        return BuildCaseWhen.model_construct(
             comparison=self.build(base.comparison),
             expr=(self.build(base.expr)),
         )
 
     @build.register
     def _(self, base: CaseElse) -> BuildCaseElse:
-        return BuildCaseElse(expr=self.build(base.expr))
+        return BuildCaseElse.model_construct(expr=self.build(base.expr))
 
     @build.register
     def _(self, base: Concept) -> BuildConcept:
@@ -1537,7 +1542,7 @@ class Factory:
             derivation, final_grain, build_lineage
         )
         is_aggregate = Concept.calculate_is_aggregate(build_lineage)
-        rval = BuildConcept(
+        rval = BuildConcept.model_construct(
             name=base.name,
             datatype=base.datatype,
             purpose=base.purpose,
@@ -1565,12 +1570,12 @@ class Factory:
         else:
             by = [self.build(x) for x in base.by]
         parent = self.build(base.function)
-        return BuildAggregateWrapper(function=parent, by=by)
+        return BuildAggregateWrapper.model_construct(function=parent, by=by)
 
     @build.register
     def _(self, base: ColumnAssignment) -> BuildColumnAssignment:
 
-        return BuildColumnAssignment(
+        return BuildColumnAssignment.model_construct(
             alias=(
                 self.build(base.alias)
                 if isinstance(base.alias, Function)
@@ -1584,26 +1589,31 @@ class Factory:
 
     @build.register
     def _(self, base: OrderBy) -> BuildOrderBy:
-        return BuildOrderBy(items=[self.build(x) for x in base.items])
+        return BuildOrderBy.model_construct(items=[self.build(x) for x in base.items])
 
     @build.register
     def _(self, base: OrderItem) -> BuildOrderItem:
-        return BuildOrderItem(
+        return BuildOrderItem.model_construct(
             expr=(self.build(base.expr)),
             order=base.order,
         )
 
     @build.register
     def _(self, base: WhereClause) -> BuildWhereClause:
-        return BuildWhereClause(conditional=self.build(base.conditional))
+        return BuildWhereClause.model_construct(
+            conditional=self.build(base.conditional)
+        )
 
     @build.register
     def _(self, base: HavingClause) -> BuildHavingClause:
-        return BuildHavingClause(conditional=self.build(base.conditional))
+        return BuildHavingClause.model_construct(
+            conditional=self.build(base.conditional)
+        )
 
     @build.register
     def _(self, base: WindowItem) -> BuildWindowItem:
-        return BuildWindowItem(
+
+        return BuildWindowItem.model_construct(
             type=base.type,
             content=self.build(base.content),
             order_by=[self.build(x) for x in base.order_by],
@@ -1613,7 +1623,7 @@ class Factory:
 
     @build.register
     def _(self, base: Conditional) -> BuildConditional:
-        return BuildConditional(
+        return BuildConditional.model_construct(
             left=(self.build(base.left)),
             right=(self.build(base.right)),
             operator=base.operator,
@@ -1621,7 +1631,7 @@ class Factory:
 
     @build.register
     def _(self, base: SubselectComparison) -> BuildSubselectComparison:
-        return BuildSubselectComparison(
+        return BuildSubselectComparison.model_construct(
             left=(self.build(base.left)),
             right=(self.build(base.right)),
             operator=base.operator,
@@ -1629,7 +1639,7 @@ class Factory:
 
     @build.register
     def _(self, base: Comparison) -> BuildComparison:
-        return BuildComparison(
+        return BuildComparison.model_construct(
             left=(self.build(base.left)),
             right=(self.build(base.right)),
             operator=base.operator,
@@ -1637,7 +1647,7 @@ class Factory:
 
     @build.register
     def _(self, base: AlignItem) -> BuildAlignItem:
-        return BuildAlignItem(
+        return BuildAlignItem.model_construct(
             alias=base.alias,
             concepts=[self.build(x) for x in base.concepts],
             namespace=base.namespace,
@@ -1645,7 +1655,9 @@ class Factory:
 
     @build.register
     def _(self, base: AlignClause) -> BuildAlignClause:
-        return BuildAlignClause(items=[self.build(x) for x in base.items])
+        return BuildAlignClause.model_construct(
+            items=[self.build(x) for x in base.items]
+        )
 
     @build.register
     def _(self, base: RowsetItem):
@@ -1663,7 +1675,7 @@ class Factory:
     def _(self, base: RowsetLineage) -> BuildRowsetLineage:
         out = BuildRowsetLineage(
             name=base.name,
-            derived_concepts=[],
+            derived_concepts=[x.address for x in base.derived_concepts],
             select=base.select,
         )
         return out
@@ -1675,17 +1687,19 @@ class Factory:
             where = factory.build(base.where_clause)
         else:
             where = None
-        return BuildGrain(components=base.components, where_clause=where)
+        return BuildGrain.model_construct(
+            components=base.components, where_clause=where
+        )
 
     @build.register
     def _(self, base: FilterItem) -> BuildFilterItem:
-        return BuildFilterItem(
+        return BuildFilterItem.model_construct(
             content=self.build(base.content), where=self.build(base.where)
         )
 
     @build.register
     def _(self, base: Parenthetical) -> BuildParenthetical:
-        return BuildParenthetical(content=(self.build(base.content)))
+        return BuildParenthetical.model_construct(content=(self.build(base.content)))
 
     @build.register
     def _(self, base: SelectLineage) -> BuildSelectLineage:
@@ -1753,7 +1767,7 @@ class Factory:
         derived_base = []
         for k in base.derived_concepts:
             base_concept = self.environment.concepts[k]
-            x = BuildConcept(
+            x = BuildConcept.model_construct(
                 name=base_concept.name,
                 datatype=base_concept.datatype,
                 purpose=base_concept.purpose,
@@ -1778,7 +1792,7 @@ class Factory:
             local_concepts=local_build_cache,
         )
         where_factory = Factory(environment=self.environment)
-        lineage = BuildMultiSelectLineage(
+        lineage = BuildMultiSelectLineage.model_construct(
             # we don't build selects here; they'll be built automatically in query discovery
             selects=base.selects,
             grain=final_grain,
@@ -1831,7 +1845,7 @@ class Factory:
         factory = Factory(
             grain=base.grain, environment=self.environment, local_concepts=local_cache
         )
-        return BuildDatasource(
+        return BuildDatasource.model_construct(
             name=base.name,
             columns=[factory.build(c) for c in base.columns],
             address=base.address,

trilogy/core/models/environment.py

@@ -39,6 +39,7 @@ from trilogy.core.models.author import (
     Concept,
     ConceptRef,
     Function,
+    SelectLineage,
     UndefinedConcept,
     UndefinedConceptFull,
     address_with_namespace,
@@ -189,6 +190,7 @@ class Environment(BaseModel):
     ] = Field(default_factory=EnvironmentDatasourceDict)
     functions: Dict[str, Function] = Field(default_factory=dict)
     data_types: Dict[str, DataType] = Field(default_factory=dict)
+    named_statements: Dict[str, SelectLineage] = Field(default_factory=dict)
     imports: Dict[str, list[Import]] = Field(
         default_factory=lambda: defaultdict(list)  # type: ignore
     )
@@ -217,6 +219,9 @@ class Environment(BaseModel):
 
         return Factory(self, local_concepts=local_concepts).build(self)
 
+    def add_rowset(self, name: str, lineage: SelectLineage):
+        self.named_statements[name] = lineage
+
     def duplicate(self):
         return Environment.model_construct(
             datasources=self.datasources.duplicate(),

trilogy/core/processing/concept_strategies_v3.py

@@ -24,6 +24,7 @@ from trilogy.core.processing.node_generators import (
     gen_merge_node,
     gen_multiselect_node,
     gen_rowset_node,
+    gen_synonym_node,
     gen_union_node,
     gen_unnest_node,
     gen_window_node,
@@ -364,7 +365,7 @@ def generate_node(
                 x.address for x in local_optional if x.derivation != Derivation.CONSTANT
             ]
             logger.info(
-                f"{depth_to_prefix(depth)}{LOGGER_PREFIX} including filter concepts, there is non root filter requirements {non_root}. Recursing with all of these as mandatory"
+                f"{depth_to_prefix(depth)}{LOGGER_PREFIX} including filter concepts, there are non root/non constant concepts we should find first: {non_root}. Recursing with all of these as mandatory"
             )
 
             if not history.check_started(
@@ -448,7 +449,7 @@ def generate_node(
                 if x.derivation not in (Derivation.ROOT, Derivation.CONSTANT)
             ]
             logger.info(
-                f"{depth_to_prefix(depth)}{LOGGER_PREFIX} including filter concepts, there is non root filter requirements {non_root}. Recursing with all of these as mandatory"
+                f"{depth_to_prefix(depth)}{LOGGER_PREFIX} including any filters, there are non-root concepts we should expand first: {non_root}. Recursing with all of these as mandatory"
             )
 
             if not history.check_started(
@@ -491,7 +492,7 @@ def generate_node(
                     all_concepts=root_targets,
                     environment=environment,
                     g=g,
-                    depth=depth,
+                    depth=depth + 1,
                     source_concepts=source_concepts,
                     history=history,
                     search_conditions=conditions,
@@ -516,9 +517,35 @@ def generate_node(
                         f"{depth_to_prefix(depth)}{LOGGER_PREFIX} Found connections for {[c.address for c in root_targets]} via concept addition; removing extra {[c.address for c in extra]}"
                     )
                     return expanded
+
+            logger.info(
+                f"{depth_to_prefix(depth)}{LOGGER_PREFIX} could not find additional concept(s) to inject"
+            )
             logger.info(
-                f"{depth_to_prefix(depth)}{LOGGER_PREFIX} could not find additional concept to inject"
+                f"{depth_to_prefix(depth)}{LOGGER_PREFIX} Could not resolve root concepts, checking for synonyms"
             )
+            if not history.check_started(
+                root_targets, accept_partial=accept_partial, conditions=conditions
+            ):
+                history.log_start(
+                    root_targets, accept_partial=accept_partial, conditions=conditions
+                )
+                resolved = gen_synonym_node(
+                    all_concepts=root_targets,
+                    environment=environment,
+                    g=g,
+                    depth=depth + 1,
+                    source_concepts=source_concepts,
+                    history=history,
+                    conditions=conditions,
+                    accept_partial=accept_partial,
+                )
+                if resolved:
+                    logger.info(
+                        f"{depth_to_prefix(depth)}{LOGGER_PREFIX} resolved concepts through synonyms"
+                    )
+                    return resolved
+
             return None
     else:
         raise ValueError(f"Unknown derivation {concept.derivation} on {concept}")
@@ -779,8 +806,6 @@ def _search_concepts(
     else:
 
         completion_mandatory = mandatory_list
-    if "date.month_seq" in completion_mandatory:
-        raise SyntaxError(completion_mandatory)
     attempted: set[str] = set()
 
     found: set[str] = set()

trilogy/core/processing/node_generators/__init__.py

@@ -6,6 +6,7 @@ from .multiselect_node import gen_multiselect_node
 from .node_merge_node import gen_merge_node
 from .rowset_node import gen_rowset_node
 from .select_node import gen_select_node
+from .synonym_node import gen_synonym_node
 from .union_node import gen_union_node
 from .unnest_node import gen_unnest_node
 from .window_node import gen_window_node
@@ -22,4 +23,5 @@ __all__ = [
     "gen_group_to_node",
     "gen_rowset_node",
     "gen_multiselect_node",
+    "gen_synonym_node",
 ]

trilogy/core/processing/node_generators/rowset_node.py

@@ -51,27 +51,32 @@ def gen_rowset_node(
     enrichment = set([x.address for x in local_optional])
 
     factory = Factory(environment=history.base_environment, grain=select.grain)
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} rowset derived concepts are {lineage.rowset.derived_concepts}"
+    )
+    concept_pool = list(environment.concepts.values()) + list(
+        environment.alias_origin_lookup.values()
+    )
+    rowset_outputs = [
+        x.address for x in concept_pool if x.address in lineage.rowset.derived_concepts
+    ]
     rowset_relevant: list[BuildConcept] = [
-        v
-        for v in environment.concepts.values()
-        if isinstance(v.lineage, BuildRowsetItem)
-        and v.lineage.rowset.name == rowset.name
+        v for v in concept_pool if v.address in rowset_outputs
     ]
-    # logger.info(
-    #     f"{padding(depth)}{LOGGER_PREFIX} rowset relevant nodes are {rowset_relevant}"
-    # )
+
     select_hidden = node.hidden_concepts
     rowset_hidden = [
         x
         for x in rowset_relevant
-        if isinstance(x.lineage, BuildRowsetItem)
+        if x.address in lineage.rowset.derived_concepts
+        and isinstance(x.lineage, BuildRowsetItem)
         and x.lineage.content.address in select_hidden
     ]
     additional_relevant = [
         factory.build(x) for x in select.output_components if x.address in enrichment
     ]
     # add in other other concepts
-    node.add_output_concepts(rowset_relevant + additional_relevant)
+    node.set_output_concepts(rowset_relevant + additional_relevant)
     if select.where_clause:
         for item in additional_relevant:
             logger.info(
@@ -84,7 +89,9 @@ def gen_rowset_node(
         for x in node.output_concepts
         if x.address not in local_optional + [concept]
         and x.derivation != Derivation.ROWSET
+        and not any(z in lineage.rowset.derived_concepts for z in x.pseudonyms)
     ]
+    logger.info(f"{padding(depth)}{LOGGER_PREFIX} hiding {final_hidden}")
     node.hide_output_concepts(final_hidden)
     assert node.resolution_cache
     # assume grain to be output of select
@@ -104,6 +111,9 @@ def gen_rowset_node(
     )
 
     node.rebuild_cache()
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} final output is {[x.address for x in node.output_concepts]}"
+    )
     if not local_optional or all(
         x.address in node.output_concepts and x.address not in node.partial_concepts
         for x in local_optional

trilogy/core/processing/node_generators/synonym_node.py

@@ -0,0 +1,68 @@
+import itertools
+from collections import defaultdict
+from typing import List
+
+from trilogy.constants import logger
+from trilogy.core.enums import FunctionType
+from trilogy.core.models.build import BuildConcept, BuildFunction, BuildWhereClause
+from trilogy.core.models.build_environment import BuildEnvironment
+from trilogy.core.processing.nodes import History, StrategyNode
+from trilogy.core.processing.utility import padding
+
+LOGGER_PREFIX = "[GEN_SYNONYM_NODE]"
+
+
+def is_union(c: BuildConcept):
+    return (
+        isinstance(c.lineage, BuildFunction)
+        and c.lineage.operator == FunctionType.UNION
+    )
+
+
+def gen_synonym_node(
+    all_concepts: List[BuildConcept],
+    environment: BuildEnvironment,
+    g,
+    depth: int,
+    source_concepts,
+    history: History | None = None,
+    conditions: BuildWhereClause | None = None,
+    accept_partial: bool = False,
+) -> StrategyNode | None:
+    local_prefix = f"[GEN_SYNONYM_NODE] {padding(depth)}"
+    base_fingerprint = tuple([x.address for x in all_concepts])
+    synonyms = defaultdict(list)
+    synonym_count = 0
+    for x in all_concepts:
+        synonyms[x.address] = [x]
+        for y in x.pseudonyms:
+
+            if y in environment.alias_origin_lookup:
+                synonyms[x.address].append(environment.alias_origin_lookup[y])
+                synonym_count += 1
+            elif y in environment.concepts:
+                synonyms[x.address].append(environment.concepts[y])
+                synonym_count += 1
+    if synonym_count == 0:
+        return None
+
+    logger.info(f"{local_prefix} Generating Synonym Node with {len(synonyms)} synonyms")
+
+    combinations = itertools.product(*(synonyms[obj] for obj in synonyms.keys()))
+    for combo in combinations:
+        fingerprint = tuple([x.address for x in combo])
+        if fingerprint == base_fingerprint:
+            continue
+        attempt: StrategyNode | None = source_concepts(
+            combo,
+            history=history,
+            environment=environment,
+            depth=depth,
+            conditions=conditions,
+            g=g,
+            accept_partial=accept_partial,
+        )
+        if attempt:
+            logger.info(f"{local_prefix} found inputs with {combo}")
+            return attempt
+    return None

trilogy/core/processing/node_generators/window_node.py

@@ -19,7 +19,6 @@ def resolve_window_parent_concepts(
     if not isinstance(concept.lineage, WINDOW_TYPES):
         raise ValueError
     base = []
-    logger.info(concept.lineage)
     if concept.lineage.over:
         base += concept.lineage.over
     if concept.lineage.order_by:

trilogy/core/query_processor.py

@@ -12,6 +12,8 @@ from trilogy.core.models.build import (
     BuildConcept,
     BuildConditional,
     BuildDatasource,
+    BuildMultiSelectLineage,
+    BuildSelectLineage,
     Factory,
 )
 from trilogy.core.models.environment import Environment
@@ -373,7 +375,10 @@ def get_query_node(
         raise ValueError(f"Statement has no output components {statement}")
 
     history = history or History(base_environment=environment)
-    build_statement = Factory(environment=environment).build(statement)
+    build_statement: BuildSelectLineage | BuildMultiSelectLineage = Factory(
+        environment=environment
+    ).build(statement)
+
     # build_statement = statement
     build_environment = environment.materialize_for_select(
         build_statement.local_concepts

trilogy/dialect/base.py

@@ -84,7 +84,9 @@ CONDITIONAL_ITEMS = (BuildConditional,)
 
 
 def INVALID_REFERENCE_STRING(x: Any, callsite: str = ""):
-    # raise SyntaxError(x)
+    # if CONFIG.validate_missing:
+    #     raise SyntaxError(f"INVALID_REFERENCE_BUG_{callsite}<{x}>")
+
     return f"INVALID_REFERENCE_BUG_{callsite}<{x}>"
 
 
@@ -293,7 +295,9 @@ class BaseDialect:
 
         #     return f"{cte.name}.{self.QUOTE_CHARACTER}{order_item.expr.safe_address}{self.QUOTE_CHARACTER} {order_item.order.value}"
 
-        return f"{self.render_expr(order_item.expr, cte=cte, qualify=False)} {order_item.order.value}"
+        return (
+            f"{self.render_expr(order_item.expr, cte=cte, )} {order_item.order.value}"
+        )
 
     def render_concept_sql(
         self,
@@ -301,7 +305,6 @@ class BaseDialect:
         cte: CTE | UnionCTE,
         alias: bool = True,
         raise_invalid: bool = False,
-        qualify: bool = True,
     ) -> str:
         result = None
         if c.pseudonyms:
@@ -315,7 +318,9 @@ class BaseDialect:
                         f"{LOGGER_PREFIX} [{c.address}] Attempting rendering w/ candidate {candidate.address}"
                     )
                     result = self._render_concept_sql(
-                        candidate, cte, raise_invalid=True, qualify=qualify
+                        candidate,
+                        cte,
+                        raise_invalid=True,
                     )
                     if result:
                         break
@@ -323,7 +328,9 @@ class BaseDialect:
                     continue
         if not result:
             result = self._render_concept_sql(
-                c, cte, raise_invalid=raise_invalid, qualify=qualify
+                c,
+                cte,
+                raise_invalid=raise_invalid,
             )
         if alias:
             return f"{result} as {self.QUOTE_CHARACTER}{c.safe_address}{self.QUOTE_CHARACTER}"
@@ -334,7 +341,6 @@ class BaseDialect:
         c: BuildConcept,
         cte: CTE | UnionCTE,
         raise_invalid: bool = False,
-        qualify: bool = True,
     ) -> str:
         # only recurse while it's in sources of the current cte
         logger.debug(
@@ -513,7 +519,6 @@ class BaseDialect:
         cte: Optional[CTE | UnionCTE] = None,
         cte_map: Optional[Dict[str, CTE | UnionCTE]] = None,
         raise_invalid: bool = False,
-        qualify: bool = True,
     ) -> str:
         if isinstance(e, SUBSELECT_COMPARISON_ITEMS):
             if isinstance(e.right, BuildConcept):
@@ -637,7 +642,6 @@ class BaseDialect:
                     cte,
                     alias=False,
                     raise_invalid=raise_invalid,
-                    qualify=qualify,
                 )
             elif cte_map:
                 return f"{cte_map[e.address].name}.{self.QUOTE_CHARACTER}{e.safe_address}{self.QUOTE_CHARACTER}"

trilogy/hooks/__init__.py

@@ -0,0 +1,4 @@
+from trilogy.hooks.graph_hook import GraphHook
+from trilogy.hooks.query_debugger import DebuggingHook
+
+__all__ = ["DebuggingHook", "GraphHook"]

trilogy/hooks/query_debugger.py

@@ -12,7 +12,6 @@ from trilogy.core.models.execute import (
 )
 from trilogy.core.processing.nodes import StrategyNode
 from trilogy.core.statements.author import SelectStatement
-from trilogy.dialect.bigquery import BigqueryDialect
 from trilogy.hooks.base_hook import BaseHook
 
 
@@ -22,9 +21,6 @@ class PrintMode(Enum):
     FULL = 3
 
 
-renderer = BigqueryDialect()
-
-
 class DebuggingHook(BaseHook):
     def __init__(
         self,
@@ -46,6 +42,9 @@ class DebuggingHook(BaseHook):
         self.process_other = PrintMode(process_other)
         self.messages: list[str] = []
         self.uuid = uuid4()
+        from trilogy.dialect.bigquery import BigqueryDialect
+
+        self.renderer = BigqueryDialect()
 
     def print(self, *args):
         merged = " ".join([str(x) for x in args])
@@ -123,7 +122,7 @@ class DebuggingHook(BaseHook):
         self.print(
             "  " * depth, input.name, "->", input.group_to_grain, "->", select_statement
         )
-        sql = renderer.render_cte(input).statement
+        sql = self.renderer.render_cte(input).statement
         for line in sql.split("\n"):
             logger.debug("  " * (depth) + line)
         if isinstance(input, CTE):

trilogy/parsing/common.py

@@ -503,6 +503,11 @@ def rowset_to_concepts(rowset: RowsetDerivationStatement, environment: Environme
         if isinstance(orig_concept.lineage, FilterItem):
             if orig_concept.lineage.where == rowset.select.where_clause:
                 name = environment.concepts[orig_concept.lineage.content.address].name
+        base_namespace = (
+            f"{rowset.name}.{orig_concept.namespace}"
+            if orig_concept.namespace != rowset.namespace
+            else rowset.name
+        )
 
         new_concept = Concept(
             name=name,
@@ -512,11 +517,7 @@ def rowset_to_concepts(rowset: RowsetDerivationStatement, environment: Environme
             grain=orig_concept.grain,
             # TODO: add proper metadata
             metadata=Metadata(concept_source=ConceptSource.CTE),
-            namespace=(
-                f"{rowset.name}.{orig_concept.namespace}"
-                if orig_concept.namespace != rowset.namespace
-                else rowset.name
-            ),
+            namespace=base_namespace,
             keys=orig_concept.keys,
             derivation=Derivation.ROWSET,
             granularity=orig_concept.granularity,

trilogy/parsing/parse_engine.py

@@ -576,11 +576,24 @@ class ParseToObjects(Transformer):
             select=select,
             namespace=self.environment.namespace or DEFAULT_NAMESPACE,
         )
+
+        # clean up current definitions
+        # to_delete = set()
+        # if output.name in self.environment.named_statements:
+        #     for k, v in self.environment.concepts.items():
+        #         if v.derivation == Derivation.ROWSET and v.lineage.rowset.name == name:
+        #             to_delete.add(k)
+        # for k in to_delete:
+        #     self.environment.concepts.pop(k)
+
         for new_concept in rowset_to_concepts(output, self.environment):
             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)
+            self.environment.add_concept(new_concept, force=True)
+
+        self.environment.add_rowset(
+            output.name, output.select.as_lineage(self.environment)
+        )
         return output
 
     @v_args(meta=True)