pytrilogy 0.0.2.56__py3-none-any.whl → 0.0.2.58__py3-none-any.whl

{pytrilogy-0.0.2.56.dist-info → pytrilogy-0.0.2.58.dist-info}/METADATA

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

{pytrilogy-0.0.2.56.dist-info → pytrilogy-0.0.2.58.dist-info}/RECORD

@@ -1,11 +1,11 @@
-trilogy/__init__.py,sha256=imedw0kyeau1auD7e6CEEG8YhDBsWVzU4AQTRovN0Ms,291
+trilogy/__init__.py,sha256=CTKkLw46Arh2GYkTbonpNlj9mv7xV7TLDpB2rTn_afU,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=qZ1d0hoKPPV2HHCoFwPYTVB7b6bXjpWvXd3lE-zEhy8,1494
 trilogy/engine.py,sha256=yOPnR7XCjWG82Gym_LLZBkYKKJdLCvqdCyt8zguNcnM,1103
 trilogy/executor.py,sha256=SbReI_xWd081WZeRt_YAyVTdMOGg2XPrsaOKgMS7YUY,15969
 trilogy/parser.py,sha256=UtuqSiGiCjpMAYgo1bvNq-b7NSzCA5hzbUW31RXaMII,281
 trilogy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/utility.py,sha256=eguES83XhmSOAQSBu5xq4aAXimiZFrxcUu81zDL22ug,707
+trilogy/utility.py,sha256=euQccZLKoYBz0LNg5tzLlvv2YHvXh9HArnYp1V3uXsM,763
 trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
 trilogy/core/enums.py,sha256=6pGjEXNJPB1ngbDQRJjxRi4NmKM8NZQ5-iwnZhrdo5U,7281
@@ -13,31 +13,31 @@ trilogy/core/env_processor.py,sha256=Pt4lmJfbShBbeSe5M7_FrTk5krrOziiAA__Slnettvc
 trilogy/core/environment_helpers.py,sha256=ugKDnPYQNxKzc1Weq_kj9IVppNdgT8iS1RTS_f5hHxc,7905
 trilogy/core/ergonomics.py,sha256=ASLDd0RqKWrZiG3XcKHo8nyTjaB_8xfE9t4NZ1UvGpc,1639
 trilogy/core/exceptions.py,sha256=1c1lQCwSw4_5CQS3q7scOkXU8GQvullJXfPHubprl90,617
-trilogy/core/functions.py,sha256=hDlwLxQUskT9iRcIic1lfACQnxMLNM5ASdHRPi0ghyw,10835
+trilogy/core/functions.py,sha256=8auZhInqnY28zg7Kil4LbvDT7jD4JggwS6HzK6ZIemE,10867
 trilogy/core/graph_models.py,sha256=mameUTiuCajtihDw_2-W218xyJlvTusOWrEKP1yAWgk,2003
 trilogy/core/internal.py,sha256=FQWbuETKPfzjALMmdXJwlOMlESfm2Z5gmErSsq3BX9c,1173
-trilogy/core/models.py,sha256=fsKfB8oL45KFw-xKKvi25ars92YckFJ_1HfVqn9TgmQ,165133
-trilogy/core/optimization.py,sha256=Jy3tVJNeqhpK6VSyTvgIWKCao6y-VCZ7mYA69MIF6L0,7989
-trilogy/core/query_processor.py,sha256=JUtsDh64mWwQHM3HFZMPtVCu-Yw7WsK3cx4NxiMACSM,18584
+trilogy/core/models.py,sha256=VrbgVuyKPtMwt3wpQnFFYFpzqNX3B94rlw6PxvpazNQ,165392
+trilogy/core/optimization.py,sha256=dIgpcletzEtcX0hAq74Y4cleAWkznR422geo00rZFKk,7900
+trilogy/core/query_processor.py,sha256=-KjOKsRhvpdR_NKxoyLq83T97Aw3J-4De-hpslzhKfQ,18576
 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=8cY7b1lLkSsiC76_C4AvXRFZ6X32hdeRquRm5upiDeo,37547
+trilogy/core/processing/concept_strategies_v3.py,sha256=Ty8JfK0KSCW-RBvw4v7RERe7xuSbzJlRSaqRfcSfOBE,37691
 trilogy/core/processing/graph_utils.py,sha256=stbYnDxnK-1kbo9L4XNU85FQhWCP-oZYO7LCXhAdC5M,1198
-trilogy/core/processing/utility.py,sha256=DEfp2F-AalS4wCRO9onhx79_-MmTH4wBfQznCq4diTY,19799
+trilogy/core/processing/utility.py,sha256=N2RUGtUuktvy1VXoVpve8F2QtCBEFQf6RWpr0PXXhwk,19671
 trilogy/core/processing/node_generators/__init__.py,sha256=s_YV1OYc336DuS9591259qjI_K_CtOCuhkf4t2aOgYs,733
-trilogy/core/processing/node_generators/basic_node.py,sha256=dz7i0BSn4qRv6SBIS_JnVAm09-nkNizoAHrznmqnJXY,3074
-trilogy/core/processing/node_generators/common.py,sha256=dHycWu9iiRxH3WIkkyibsnYD5mJfXvdEOhsTvyaO8fg,9128
+trilogy/core/processing/node_generators/basic_node.py,sha256=pExVmLDQK9okXNeC1-jQgDwpj8JWAgQfejd2lMt8L4U,3157
+trilogy/core/processing/node_generators/common.py,sha256=Ft5giLHFn0t_A_4FPl6MJWsi0ghEen0bPFAmrdZ3S58,9107
 trilogy/core/processing/node_generators/filter_node.py,sha256=aWR82yAZOAnUrJejTj6yD4jpqH6cSPzyJMd1V-M0Kj0,7883
 trilogy/core/processing/node_generators/group_node.py,sha256=k57SVWHSVvTqCd47tyLUGCsSZaP7UQqMCJYTSz1S7oQ,5566
-trilogy/core/processing/node_generators/group_to_node.py,sha256=8ToptIWQoJttquEPrRTMvU33jCJQI-VJxVObN8W8QJk,2511
-trilogy/core/processing/node_generators/multiselect_node.py,sha256=se-cHRYRPskxq2Wq9bw5LkUFSCN1rhk8_05-OTezLz0,6421
+trilogy/core/processing/node_generators/group_to_node.py,sha256=CZiPnD4rEkMOdyBQrDaH6HA3VSMKJ775BiJdQkM7dO8,2939
+trilogy/core/processing/node_generators/multiselect_node.py,sha256=qmaufoSVwavNBNsdw0NGpNOTNWFPDKunA9COohEYW08,6469
 trilogy/core/processing/node_generators/node_merge_node.py,sha256=3GzuiTiorFVe9MyLhoz2PDyI0x9XL7bQ8ucEbV54le8,14627
-trilogy/core/processing/node_generators/rowset_node.py,sha256=ekrXWFu4ga3VR59Ux870w5gSmzFPC9WjIRuyB4yFqag,5138
-trilogy/core/processing/node_generators/select_merge_node.py,sha256=YW0H81IpE9B6f0SK75QH2DVSfr8d3oA9AbbqP44Jhnc,15746
+trilogy/core/processing/node_generators/rowset_node.py,sha256=FDCJORLEcmpF9a071IFl-VbmKjq32rFOXi1SarjBVxY,5167
+trilogy/core/processing/node_generators/select_merge_node.py,sha256=yfNeuc24Ejn7j07szwJif60qmU6OVk3wfa7C2_RJ39k,15996
 trilogy/core/processing/node_generators/select_node.py,sha256=bjTylBa-vYbmzpuSpphmIo_Oi78YZpI8ppHnN9KDYDk,1795
 trilogy/core/processing/node_generators/union_node.py,sha256=MfJjF2m0ARl0oUH9QT1awzPv0e3yA3mXK1XqAvUTgKw,2504
 trilogy/core/processing/node_generators/unnest_node.py,sha256=8El2B1mzC9vIUSk-m94xHvaJwAf5GtCAGfTxGDSiqmU,2229
@@ -45,16 +45,16 @@ trilogy/core/processing/node_generators/window_node.py,sha256=5htRRxaxw6EnS-2TVo
 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=hJZS7GT0dl7sK0riweEwVAVRv5LCXOnMD1hF0XY9hpE,6548
 trilogy/core/processing/nodes/__init__.py,sha256=WNUmYmZF3uqF2qiJ1L7y0u9qiVD9YnluKds0wA5opJE,4813
-trilogy/core/processing/nodes/base_node.py,sha256=YQcohrk3VJHgasaHrz13bf5S9tRyGBX5ZAy3aB6yIVA,15637
+trilogy/core/processing/nodes/base_node.py,sha256=YgZaiAlzvwa7AkHXNfMo5R0DJKWdvbDvMWEvTJR7fpM,16081
 trilogy/core/processing/nodes/filter_node.py,sha256=j7icDAXJ7oFPkHTOQVmm9QbZxrhhYEUGJj2lSiguXKA,2292
-trilogy/core/processing/nodes/group_node.py,sha256=C2U4kyfYnM0Gy1b_C5K-uh-s-9Kncr5olFxMuF0G7zQ,7852
-trilogy/core/processing/nodes/merge_node.py,sha256=Fnnmb86GGZGYD3tqrTwwkhvtsqmB4u5vL1TpDe7R1hY,14759
-trilogy/core/processing/nodes/select_node_v2.py,sha256=t3ln9Kxeml8mVTnLgtNPvavb5TLTRtfkJ0nyxh7UYUs,8212
+trilogy/core/processing/nodes/group_node.py,sha256=7lX9SvOK_-oPeg4UydjYMcp4BB7IneJxT-bqEs-OSQ8,7272
+trilogy/core/processing/nodes/merge_node.py,sha256=lHRL1CpiFUocqyMVzGt97VAH_aUeHAEjebGFL1YwHys,14754
+trilogy/core/processing/nodes/select_node_v2.py,sha256=cwbVuiu81EsX86cHCmiZSydTNJ1V3ODuXQaWO1HU4xQ,8207
 trilogy/core/processing/nodes/union_node.py,sha256=1QgOWkjJ-ADFdanoRzi0EM5buhuzJbmlda9BAUGp4mM,1352
 trilogy/core/processing/nodes/unnest_node.py,sha256=0TFANwqVPaVpUR6SF5uweGTlXfEnagXRBBZU6dUwtcY,2101
 trilogy/core/processing/nodes/window_node.py,sha256=yYwWuOq1Uwm-xEl8lFH_urm-YXaAGAgNhE20MEoD5QQ,1163
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=DR7cHoL5rbRBnsj6PCq5wK8GHH-l5szpKXUaxMqx1Mw,38568
+trilogy/dialect/base.py,sha256=TtQ3ATAaXKVsrhMA9EGkSS-vIC_jX0nHCzK5GBrgvrg,38511
 trilogy/dialect/bigquery.py,sha256=mKC3zoEU232h9RtIXJjqiZ72lWH8a6S28p6wAZKrAfg,2952
 trilogy/dialect/common.py,sha256=b0E6JqdKaaSzThLiFa9jwUg4YnXahf-3bqmzOn5z-6E,3827
 trilogy/dialect/config.py,sha256=UiBY2tBbNk9owx-zxP_3lN9lErEUXhXIU_bcXA18AvU,2992
@@ -79,9 +79,9 @@ trilogy/parsing/render.py,sha256=o4C12a407iZvlRGUJDiuJUezrLLo4QEaLtu60ZQX3gk,169
 trilogy/parsing/trilogy.lark,sha256=EazfEvYPuvkPkNjUnVzFi0uD9baavugbSI8CyfawShk,12573
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=DQDW81E5mDMWFP8oPw8q-IyrR2JGxQSDWgUWe2VTSRQ,3731
-pytrilogy-0.0.2.56.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.56.dist-info/METADATA,sha256=K7l5WsgFmt55n7NLqvBsmeUfIXD3g9YIE8wN2v_SGv0,8823
-pytrilogy-0.0.2.56.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pytrilogy-0.0.2.56.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.56.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.56.dist-info/RECORD,,
+pytrilogy-0.0.2.58.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.58.dist-info/METADATA,sha256=PYvDIfNL0E2TRIBxawpJ_SyhNDfc2TWlFnL5uOeGO0E,8823
+pytrilogy-0.0.2.58.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pytrilogy-0.0.2.58.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.58.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.58.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.56"
+__version__ = "0.0.2.58"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/functions.py

@@ -127,10 +127,11 @@ def Unnest(args: list[Concept]) -> Function:
 
 def Group(args: list[Concept]) -> Function:
     output = args[0]
+    datatype = arg_to_datatype(output)
     return Function(
         operator=FunctionType.GROUP,
         arguments=args,
-        output_datatype=output.datatype,
+        output_datatype=datatype,
         output_purpose=Purpose.PROPERTY,
         arg_count=-1,
     )

trilogy/core/models.py

@@ -923,9 +923,16 @@ class Grain(Namespaced, BaseModel):
             if not self.where_clause:
                 where = other.where_clause
             elif not other.where_clause == self.where_clause:
-                raise NotImplementedError(
-                    f"Cannot merge grains with where clauses, self {self.where_clause} other {other.where_clause}"
+                where = WhereClause(
+                    conditional=Conditional(
+                        left=self.where_clause.conditional,
+                        right=other.where_clause.conditional,
+                        operator=BooleanOperator.AND,
+                    )
                 )
+                # raise NotImplementedError(
+                #     f"Cannot merge grains with where clauses, self {self.where_clause} other {other.where_clause}"
+                # )
         return Grain(
             components=self.components.union(other.components), where_clause=where
         )
@@ -1863,11 +1870,11 @@ class SelectStatement(HasUUID, Mergeable, Namespaced, SelectTypeMixin, BaseModel
         return output
 
     @property
-    def hidden_components(self) -> List[Concept]:
-        output = []
+    def hidden_components(self) -> set[str]:
+        output = set()
         for item in self.selection:
             if isinstance(item, SelectItem) and Modifier.HIDDEN in item.modifiers:
-                output.append(item.output)
+                output.add(item.output.address)
         return output
 
     @property
@@ -2097,10 +2104,10 @@ class MultiSelectStatement(HasUUID, SelectTypeMixin, Mergeable, Namespaced, Base
 
     @computed_field  # type: ignore
     @cached_property
-    def hidden_components(self) -> List[Concept]:
-        output = []
+    def hidden_components(self) -> set[str]:
+        output: set[str] = set()
         for select in self.selects:
-            output += select.hidden_components
+            output = output.union(select.hidden_components)
         return output
 
 
@@ -2182,6 +2189,10 @@ class Datasource(HasUUID, Namespaced, BaseModel):
     def duplicate(self) -> Datasource:
         return self.model_copy(deep=True)
 
+    @property
+    def hidden_concepts(self) -> List[Concept]:
+        return []
+
     def merge_concept(
         self, source: Concept, target: Concept, modifiers: List[Modifier]
     ):
@@ -2254,17 +2265,7 @@ class Datasource(HasUUID, Namespaced, BaseModel):
     @field_validator("grain", mode="before")
     @classmethod
     def grain_enforcement(cls, v: Grain, info: ValidationInfo):
-        values = info.data
         grain: Grain = safe_grain(v)
-        if not grain.components:
-            columns: List[ColumnAssignment] = values.get("columns", [])
-            grain = Grain.from_concepts(
-                [
-                    c.concept.with_grain(Grain())
-                    for c in columns
-                    if c.concept.purpose == Purpose.KEY
-                ]
-            )
         return grain
 
     def add_column(
@@ -2507,7 +2508,7 @@ class QueryDatasource(BaseModel):
     filter_concepts: List[Concept] = Field(default_factory=list)
     source_type: SourceType = SourceType.SELECT
     partial_concepts: List[Concept] = Field(default_factory=list)
-    hidden_concepts: List[Concept] = Field(default_factory=list)
+    hidden_concepts: set[str] = Field(default_factory=set)
     nullable_concepts: List[Concept] = Field(default_factory=list)
     join_derived_concepts: List[Concept] = Field(default_factory=list)
     force_group: bool | None = None
@@ -2659,10 +2660,10 @@ class QueryDatasource(BaseModel):
             final_source_map[k] = set(
                 merged_datasources.get(x.safe_identifier, x) for x in list(v)
             )
-        self_hidden = self.hidden_concepts or []
-        other_hidden = other.hidden_concepts or []
+        self_hidden: set[str] = self.hidden_concepts or set()
+        other_hidden: set[str] = other.hidden_concepts or set()
         # hidden is the minimum overlapping set
-        hidden = [x for x in self_hidden if x.address in other_hidden]
+        hidden = self_hidden.intersection(other_hidden)
         qds = QueryDatasource(
             input_concepts=unique(
                 self.input_concepts + other.input_concepts, "address"
@@ -2760,7 +2761,7 @@ class CTE(BaseModel):
     partial_concepts: List[Concept] = Field(default_factory=list)
     nullable_concepts: List[Concept] = Field(default_factory=list)
     join_derived_concepts: List[Concept] = Field(default_factory=list)
-    hidden_concepts: List[Concept] = Field(default_factory=list)
+    hidden_concepts: set[str] = Field(default_factory=set)
     order_by: Optional[OrderBy] = None
     limit: Optional[int] = None
     base_name_override: Optional[str] = None
@@ -2946,10 +2947,10 @@ class CTE(BaseModel):
                 f" {self.name} {other.name} conditions {self.condition} {other.condition}"
             )
             raise ValueError(error)
-        mutually_hidden = []
+        mutually_hidden = set()
         for concept in self.hidden_concepts:
-            if concept.address in other.hidden_concepts:
-                mutually_hidden.append(concept)
+            if concept in other.hidden_concepts:
+                mutually_hidden.add(concept)
         self.partial_concepts = unique(
             self.partial_concepts + other.partial_concepts, "address"
         )
@@ -3073,12 +3074,18 @@ class CTE(BaseModel):
                 assert isinstance(c.lineage, RowsetItem)
                 return check_is_not_in_group(c.lineage.content)
             if c.derivation == PurposeLineage.CONSTANT:
-                return False
+                return True
             if c.purpose == Purpose.METRIC:
                 return True
-            elif c.derivation == PurposeLineage.BASIC and c.lineage:
+
+            if c.derivation == PurposeLineage.BASIC and c.lineage:
                 if all([check_is_not_in_group(x) for x in c.lineage.concept_arguments]):
                     return True
+                if (
+                    isinstance(c.lineage, Function)
+                    and c.lineage.operator == FunctionType.GROUP
+                ):
+                    return check_is_not_in_group(c.lineage.concept_arguments[0])
             return False
 
         return (
@@ -3125,7 +3132,7 @@ class UnionCTE(BaseModel):
     operator: str = "UNION ALL"
     order_by: Optional[OrderBy] = None
     limit: Optional[int] = None
-    hidden_concepts: list[Concept] = Field(default_factory=list)
+    hidden_concepts: set[str] = Field(default_factory=set)
     partial_concepts: list[Concept] = Field(default_factory=list)
     existence_source_map: Dict[str, list[str]] = Field(default_factory=dict)
 
@@ -3756,6 +3763,7 @@ class Environment(BaseModel):
         for k, v in self.concepts.items():
             if v.address == target.address:
                 v.pseudonyms.add(source.address)
+
             if v.address == source.address:
                 replacements[k] = target
                 v.pseudonyms.add(target.address)
@@ -4496,7 +4504,7 @@ class ProcessedQuery(BaseModel):
     base: CTE | UnionCTE
     joins: List[Join]
     grain: Grain
-    hidden_columns: List[Concept] = Field(default_factory=list)
+    hidden_columns: set[str] = Field(default_factory=set)
     limit: Optional[int] = None
     where_clause: Optional[WhereClause] = None
     having_clause: Optional[HavingClause] = None

trilogy/core/optimization.py

@@ -136,15 +136,12 @@ def is_direct_return_eligible(cte: CTE | UnionCTE) -> CTE | UnionCTE | None:
 
     assert isinstance(cte, CTE)
     derived_concepts = [
-        c
-        for c in cte.source.output_concepts + cte.source.hidden_concepts
-        if c not in cte.source.input_concepts
+        c for c in cte.source.output_concepts if c not in cte.source.input_concepts
     ]
 
     parent_derived_concepts = [
         c
         for c in direct_parent.source.output_concepts
-        + direct_parent.source.hidden_concepts
         if c not in direct_parent.source.input_concepts
     ]
     condition_arguments = cte.condition.row_arguments if cte.condition else []
@@ -180,8 +177,8 @@ def optimize_ctes(
     ):
         direct_parent.order_by = root_cte.order_by
         direct_parent.limit = root_cte.limit
-        direct_parent.hidden_concepts = (
-            root_cte.hidden_concepts + direct_parent.hidden_concepts
+        direct_parent.hidden_concepts = root_cte.hidden_concepts.union(
+            direct_parent.hidden_concepts
         )
         if root_cte.condition:
             if direct_parent.condition:

trilogy/core/processing/concept_strategies_v3.py

@@ -539,11 +539,14 @@ def validate_concept(
             found_addresses.add(concept.address)
             found_map[str(node)].add(concept)
     for v_address in concept.pseudonyms:
+        if v_address in seen:
+            return
         v = environment.concepts[v_address]
-        if v == concept.address:
+        if v.address in seen:
             return
-        if v in seen:
+        if v.address == concept.address:
             return
+
         validate_concept(
             v,
             node,
@@ -577,7 +580,7 @@ def validate_stack(
         resolved = node.resolve()
 
         for concept in resolved.output_concepts:
-            if concept in resolved.hidden_concepts:
+            if concept.address in resolved.hidden_concepts:
                 continue
             validate_concept(
                 concept,
@@ -988,17 +991,20 @@ def source_query_concepts(
         raise ValueError(
             f"Could not resolve conections between {error_strings} from environment graph."
         )
-    candidate = GroupNode(
-        output_concepts=[
-            x for x in root.output_concepts if x.address not in root.hidden_concepts
-        ],
-        input_concepts=[
-            x for x in root.output_concepts if x.address not in root.hidden_concepts
-        ],
+    final = [x for x in root.output_concepts if x.address not in root.hidden_concepts]
+    if GroupNode.check_if_required(
+        downstream_concepts=final,
+        parents=[root.resolve()],
         environment=environment,
-        parents=[root],
-        partial_concepts=root.partial_concepts,
-    )
-    if not candidate.resolve().group_required:
-        return root
+    ).required:
+        candidate: StrategyNode = GroupNode(
+            output_concepts=final,
+            input_concepts=final,
+            environment=environment,
+            parents=[root],
+            partial_concepts=root.partial_concepts,
+        )
+    else:
+        candidate = root
+
     return candidate

trilogy/core/processing/node_generators/basic_node.py

@@ -13,6 +13,7 @@ from trilogy.core.processing.node_generators.common import (
     resolve_function_parent_concepts,
 )
 from trilogy.core.processing.nodes import History, StrategyNode
+from trilogy.utility import unique
 
 LOGGER_PREFIX = "[GEN_BASIC_NODE]"
 
@@ -65,7 +66,9 @@ def gen_basic_node(
     non_equivalent_optional = [
         x for x in local_optional if x not in equivalent_optional
     ]
-    all_parents = parent_concepts + non_equivalent_optional
+    all_parents: list[Concept] = unique(
+        parent_concepts + non_equivalent_optional, "address"
+    )
     logger.info(
         f"{depth_prefix}{LOGGER_PREFIX} Fetching parents {[x.address for x in all_parents]}"
     )

trilogy/core/processing/node_generators/common.py

@@ -208,7 +208,7 @@ def gen_enrichment_node(
     non_hidden = [
         x
         for x in base_node.output_concepts
-        if x.address not in [y.address for y in base_node.hidden_concepts]
+        if x.address not in base_node.hidden_concepts
     ]
     return MergeNode(
         input_concepts=unique(join_keys + extra_required + non_hidden, "address"),

trilogy/core/processing/node_generators/group_to_node.py

@@ -26,6 +26,7 @@ def gen_group_to_node(
     # aggregates MUST always group to the proper grain
     if not isinstance(concept.lineage, Function):
         raise SyntaxError("Group to should have function lineage")
+    group_arg = concept.lineage.arguments[0]
     parent_concepts: List[Concept] = concept.lineage.concept_arguments
     logger.info(
         f"{padding(depth)}{LOGGER_PREFIX} group by node has required parents {[x.address for x in parent_concepts]}"
@@ -47,6 +48,13 @@ def gen_group_to_node(
         environment=environment,
         parents=parents,
         depth=depth,
+        preexisting_conditions=conditions.conditional if conditions else None,
+        hidden_concepts=set(
+            [group_arg.address]
+            if isinstance(group_arg, Concept)
+            and group_arg.address not in local_optional
+            else []
+        ),
     )
 
     # early exit if no optional
@@ -62,6 +70,7 @@ def gen_group_to_node(
         g=g,
         depth=depth + 1,
         history=history,
+        conditions=conditions,
     )
     if not enrich_node:
         logger.info(
@@ -83,4 +92,5 @@ def gen_group_to_node(
         ],
         whole_grain=True,
         depth=depth,
+        preexisting_conditions=conditions.conditional if conditions else None,
     )

trilogy/core/processing/node_generators/multiselect_node.py

@@ -69,6 +69,7 @@ def gen_multiselect_node(
     lineage: MultiSelectStatement = concept.lineage
 
     base_parents: List[StrategyNode] = []
+    partial = []
     for select in lineage.selects:
         snode: StrategyNode = source_concepts(
             mandatory_list=select.output_components,
@@ -103,6 +104,9 @@ def gen_multiselect_node(
         for mc in merge_concepts:
             assert mc in snode.resolve().output_concepts
         base_parents.append(snode)
+        if select.where_clause:
+            for item in select.output_components:
+                partial.append(item)
 
     node_joins = extra_align_joins(lineage, base_parents)
     node = MergeNode(
@@ -112,35 +116,28 @@ def gen_multiselect_node(
         depth=depth,
         parents=base_parents,
         node_joins=node_joins,
+        hidden_concepts=set([x for y in base_parents for x in y.hidden_concepts]),
     )
 
     enrichment = set([x.address for x in local_optional])
 
-    rowset_relevant = [
+    multiselect_relevant = [
         x
         for x in lineage.derived_concepts
         if x.address == concept.address or x.address in enrichment
     ]
-    additional_relevant = [
-        x for x in select.output_components if x.address in enrichment
-    ]
+    additional_relevant = [x for x in node.output_concepts if x.address in enrichment]
     # add in other other concepts
-    for item in rowset_relevant:
-        node.output_concepts.append(item)
-    for item in additional_relevant:
-        node.output_concepts.append(item)
-    if select.where_clause:
-        for item in additional_relevant:
-            node.partial_concepts.append(item)
 
-    # we need a better API for refreshing a nodes QDS
-    node.resolution_cache = node._resolve()
+    node.set_output_concepts(multiselect_relevant + additional_relevant)
 
-    # assume grain to be output of select
-    # but don't include anything aggregate at this point
-    node.resolution_cache.grain = Grain.from_concepts(
-        node.output_concepts,
-    )
+    # node.add_partial_concepts(partial)
+    # if select.where_clause:
+    #     for item in additional_relevant:
+    #         node.partial_concepts.append(item)
+    node.grain = Grain.from_concepts(node.output_concepts, environment=environment)
+    node.rebuild_cache()
+    # we need a better API for refreshing a nodes QDS
     possible_joins = concept_to_relevant_joins(additional_relevant)
     if not local_optional:
         logger.info(
@@ -159,6 +156,7 @@ def gen_multiselect_node(
             f"{padding(depth)}{LOGGER_PREFIX} all enriched concepts returned from base rowset node; exiting early"
         )
         return node
+
     enrich_node: MergeNode = source_concepts(  # this fetches the parent + join keys
         # to then connect to the rest of the query
         mandatory_list=additional_relevant + local_optional,

trilogy/core/processing/node_generators/rowset_node.py

@@ -47,7 +47,7 @@ def gen_rowset_node(
         return None
     enrichment = set([x.address for x in local_optional])
     rowset_relevant = [x for x in rowset.derived_concepts]
-    select_hidden = set([x.address for x in select.hidden_components])
+    select_hidden = select.hidden_components
     rowset_hidden = [
         x
         for x in rowset.derived_concepts
@@ -80,7 +80,9 @@ def gen_rowset_node(
             for x in node.output_concepts
             if x.address
             not in [
-                y for y in node.hidden_concepts if y.derivation != PurposeLineage.ROWSET
+                y
+                for y in node.hidden_concepts
+                if environment.concepts[y].derivation != PurposeLineage.ROWSET
             ]
         ],
     )
@@ -103,6 +105,7 @@ def gen_rowset_node(
         )
         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"
         )

trilogy/core/processing/node_generators/select_merge_node.py

@@ -240,10 +240,12 @@ def create_datasource_node(
     depth: int,
     conditions: WhereClause | None = None,
 ) -> tuple[StrategyNode, bool]:
-    target_grain = Grain.from_concepts(all_concepts)
+    target_grain = Grain.from_concepts(all_concepts, environment=environment)
     force_group = False
     if not datasource.grain.issubset(target_grain):
         force_group = True
+    if not datasource.grain.components:
+        force_group = True
     partial_concepts = [
         c.concept
         for c in datasource.columns
@@ -350,6 +352,9 @@ def create_select_node(
 
     # we need to nest the group node one further
     if force_group is True:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} source requires group before consumption."
+        )
         candidate: StrategyNode = GroupNode(
             output_concepts=all_concepts,
             input_concepts=all_concepts,
@@ -359,8 +364,10 @@ def create_select_node(
             partial_concepts=bcandidate.partial_concepts,
             nullable_concepts=bcandidate.nullable_concepts,
             preexisting_conditions=bcandidate.preexisting_conditions,
+            force_group=force_group,
         )
     else:
+
         candidate = bcandidate
     return candidate
 

trilogy/core/processing/nodes/base_node.py

@@ -40,9 +40,10 @@ def resolve_concept_map(
         for concept in input.output_concepts:
             if concept.address not in input.non_partial_concept_addresses:
                 continue
-            if isinstance(input, QueryDatasource) and concept.address in [
-                x.address for x in input.hidden_concepts
-            ]:
+            if (
+                isinstance(input, QueryDatasource)
+                and concept.address in input.hidden_concepts
+            ):
                 continue
             if concept.address in full_addresses:
                 concept_map[concept.address].add(input)
@@ -138,7 +139,7 @@ class StrategyNode:
         preexisting_conditions: Conditional | Comparison | Parenthetical | None = None,
         force_group: bool | None = None,
         grain: Optional[Grain] = None,
-        hidden_concepts: List[Concept] | None = None,
+        hidden_concepts: set[str] | None = None,
         existence_concepts: List[Concept] | None = None,
         virtual_output_concepts: List[Concept] | None = None,
     ):
@@ -165,7 +166,7 @@ class StrategyNode:
         self.grain = grain
         self.force_group = force_group
         self.tainted = False
-        self.hidden_concepts = hidden_concepts or []
+        self.hidden_concepts = hidden_concepts or set()
         self.existence_concepts = existence_concepts or []
         self.virtual_output_concepts = virtual_output_concepts or []
         self.preexisting_conditions = preexisting_conditions
@@ -192,6 +193,8 @@ class StrategyNode:
         for x in self.parents:
             for z in x.usable_outputs:
                 non_hidden.add(z.address)
+                for psd in z.pseudonyms:
+                    non_hidden.add(psd)
         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(
@@ -246,6 +249,15 @@ class StrategyNode:
             self.rebuild_cache()
         return self
 
+    def add_partial_concepts(self, concepts: List[Concept], rebuild: bool = True):
+        for concept in concepts:
+            if concept.address not in self.partial_lcl.addresses:
+                self.partial_concepts.append(concept)
+        self.partial_lcl = LooseConceptList(concepts=self.partial_concepts)
+        if rebuild:
+            self.rebuild_cache()
+        return self
+
     def add_existence_concepts(self, concepts: List[Concept], rebuild: bool = True):
         for concept in concepts:
             if concept.address not in self.output_concepts:
@@ -270,22 +282,20 @@ class StrategyNode:
 
     def hide_output_concepts(self, concepts: List[Concept], rebuild: bool = True):
         for x in concepts:
-            self.hidden_concepts.append(x)
+            self.hidden_concepts.add(x.address)
         if rebuild:
             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
-        ]
+        self.hidden_concepts = set(x for x in self.hidden_concepts if x 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)
+            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
@@ -377,7 +387,7 @@ class StrategyNode:
             preexisting_conditions=self.preexisting_conditions,
             force_group=self.force_group,
             grain=self.grain,
-            hidden_concepts=list(self.hidden_concepts),
+            hidden_concepts=set(self.hidden_concepts),
             existence_concepts=list(self.existence_concepts),
             virtual_output_concepts=list(self.virtual_output_concepts),
         )

trilogy/core/processing/nodes/group_node.py

@@ -1,3 +1,4 @@
+from dataclasses import dataclass
 from typing import List, Optional
 
 from trilogy.constants import logger
@@ -8,7 +9,6 @@ from trilogy.core.models import (
     Datasource,
     Environment,
     Grain,
-    LooseConceptList,
     Parenthetical,
     QueryDatasource,
     SourceType,
@@ -24,6 +24,13 @@ from trilogy.utility import unique
 LOGGER_PREFIX = "[CONCEPT DETAIL - GROUP NODE]"
 
 
+@dataclass
+class GroupRequiredResponse:
+    target: Grain
+    upstream: Grain
+    required: bool
+
+
 class GroupNode(StrategyNode):
     source_type = SourceType.GROUP
 
@@ -41,7 +48,7 @@ class GroupNode(StrategyNode):
         conditions: Conditional | Comparison | Parenthetical | None = None,
         preexisting_conditions: Conditional | Comparison | Parenthetical | None = None,
         existence_concepts: List[Concept] | None = None,
-        hidden_concepts: List[Concept] | None = None,
+        hidden_concepts: set[str] | None = None,
     ):
         super().__init__(
             input_concepts=input_concepts,
@@ -59,45 +66,44 @@ class GroupNode(StrategyNode):
             hidden_concepts=hidden_concepts,
         )
 
-    def _resolve(self) -> QueryDatasource:
-        parent_sources: List[QueryDatasource | Datasource] = [
-            p.resolve() for p in self.parents
-        ]
-
-        target_grain = self.grain or Grain.from_concepts(
+    @classmethod
+    def check_if_required(
+        cls,
+        downstream_concepts: List[Concept],
+        parents: list[QueryDatasource | Datasource],
+        environment: Environment,
+    ) -> GroupRequiredResponse:
+        target_grain = Grain.from_concepts(
             concepts_to_grain_concepts(
-                self.output_concepts, environment=self.environment
+                downstream_concepts,
+                environment=environment,
             )
         )
         comp_grain = Grain()
-        for source in parent_sources:
+        for source in parents:
             comp_grain += source.grain
         comp_grain = Grain.from_concepts(
-            concepts_to_grain_concepts(
-                comp_grain.components, environment=self.environment
-            )
+            concepts_to_grain_concepts(comp_grain.components, environment=environment)
         )
         # dynamically select if we need to group
         # because sometimes, we are already at required grain
-        if comp_grain == target_grain and self.force_group is not True:
-            # if there is no group by, and inputs equal outputs
-            # return the parent
-            logger.info(
-                f"{self.logging_prefix}{LOGGER_PREFIX} Grain of group by equals output"
-                f" grains {comp_grain} and {target_grain}"
-            )
-            if (
-                len(parent_sources) == 1
-                and LooseConceptList(concepts=parent_sources[0].output_concepts)
-                == self.output_lcl
-            ) and isinstance(parent_sources[0], QueryDatasource):
-                logger.info(
-                    f"{self.logging_prefix}{LOGGER_PREFIX} No group by required as inputs match outputs of parent; returning parent node"
-                )
-                will_return: QueryDatasource = parent_sources[0]
-                if self.conditions:
-                    will_return.condition = self.conditions + will_return.condition
-                return will_return
+        if comp_grain.issubset(target_grain):
+            return GroupRequiredResponse(target_grain, comp_grain, False)
+
+        return GroupRequiredResponse(target_grain, comp_grain, True)
+
+    def _resolve(self) -> QueryDatasource:
+        parent_sources: List[QueryDatasource | Datasource] = [
+            p.resolve() for p in self.parents
+        ]
+        grains = self.check_if_required(
+            self.output_concepts, parent_sources, self.environment
+        )
+        target_grain = grains.target
+        comp_grain = grains.upstream
+        # dynamically select if we need to group
+        # because sometimes, we are already at required grain
+        if not grains.required and self.force_group is not True:
             # otherwise if no group by, just treat it as a select
             source_type = SourceType.SELECT
         else:
@@ -108,15 +114,6 @@ class GroupNode(StrategyNode):
                 f" target grain {target_grain}"
                 f" delta: {comp_grain - target_grain}"
             )
-            for parent in self.parents:
-                logger.info(
-                    f"{self.logging_prefix}{LOGGER_PREFIX} Parent node"
-                    f" {[c.address for c in parent.output_concepts[:2]]}... has"
-                    " set node grain"
-                    f" {parent.grain}"
-                    f" and resolved grain {parent.resolve().grain}"
-                    f" {type(parent)}"
-                )
             source_type = SourceType.GROUP
         source_map = resolve_concept_map(
             parent_sources,
@@ -157,9 +154,9 @@ class GroupNode(StrategyNode):
                 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
-            ]
+            base.hidden_concepts = set(
+                [x for x in base.hidden_concepts if x not in base.output_concepts]
+            )
             source_map = resolve_concept_map(
                 [base],
                 targets=self.output_concepts,
@@ -194,5 +191,5 @@ class GroupNode(StrategyNode):
             conditions=self.conditions,
             preexisting_conditions=self.preexisting_conditions,
             existence_concepts=list(self.existence_concepts),
-            hidden_concepts=list(self.hidden_concepts),
+            hidden_concepts=set(self.hidden_concepts),
         )

trilogy/core/processing/nodes/merge_node.py

@@ -115,7 +115,7 @@ class MergeNode(StrategyNode):
         grain: Grain | None = None,
         conditions: Conditional | Comparison | Parenthetical | None = None,
         preexisting_conditions: Conditional | Comparison | Parenthetical | None = None,
-        hidden_concepts: List[Concept] | None = None,
+        hidden_concepts: set[str] | None = None,
         virtual_output_concepts: List[Concept] | None = None,
         existence_concepts: List[Concept] | None = None,
     ):
@@ -310,6 +310,7 @@ class MergeNode(StrategyNode):
         for join in joins:
             if isinstance(join, BaseJoin) and join.join_type == JoinType.FULL:
                 full_join_concepts += join.input_concepts
+
         if self.whole_grain:
             force_group = False
         elif self.force_group is False:
@@ -368,7 +369,7 @@ class MergeNode(StrategyNode):
             conditions=self.conditions,
             preexisting_conditions=self.preexisting_conditions,
             nullable_concepts=list(self.nullable_concepts),
-            hidden_concepts=list(self.hidden_concepts),
+            hidden_concepts=set(self.hidden_concepts),
             virtual_output_concepts=list(self.virtual_output_concepts),
             node_joins=list(self.node_joins) if self.node_joins else None,
             join_concepts=list(self.join_concepts) if self.join_concepts else None,

trilogy/core/processing/nodes/select_node_v2.py

@@ -45,7 +45,7 @@ class SelectNode(StrategyNode):
         force_group: bool | None = False,
         conditions: Conditional | Comparison | Parenthetical | None = None,
         preexisting_conditions: Conditional | Comparison | Parenthetical | None = None,
-        hidden_concepts: List[Concept] | None = None,
+        hidden_concepts: set[str] | None = None,
     ):
         super().__init__(
             input_concepts=input_concepts,

trilogy/core/processing/utility.py

@@ -6,7 +6,6 @@ from typing import Any, Dict, List, Set, Tuple
 
 import networkx as nx
 
-from trilogy.constants import logger
 from trilogy.core.enums import BooleanOperator, FunctionClass, Granularity, Purpose
 from trilogy.core.models import (
     CTE,
@@ -161,8 +160,6 @@ def resolve_join_order_v2(
                 final_join_type = JoinType.LEFT_OUTER
             elif any([x == JoinType.FULL for x in join_types]):
                 final_join_type = JoinType.FULL
-            logger.info("JOIN DEBUG")
-            logger.info(joinkeys)
             output.append(
                 JoinOrderOutput(
                     # left=left_candidate,
@@ -350,6 +347,8 @@ def get_node_joins(
         graph.add_node(ds_node, type=NodeType.NODE)
         partials[ds_node] = [f"c~{c.address}" for c in datasource.partial_concepts]
         for concept in datasource.output_concepts:
+            if concept.address in datasource.hidden_concepts:
+                continue
             add_node_join_concept(
                 graph=graph,
                 concept=concept,
@@ -568,9 +567,8 @@ def find_nullable_concepts(
 def sort_select_output_processed(
     cte: CTE | UnionCTE, query: ProcessedQuery
 ) -> CTE | UnionCTE:
-    hidden_addresses = [c.address for c in query.hidden_columns]
     output_addresses = [
-        c.address for c in query.output_columns if c.address not in hidden_addresses
+        c.address for c in query.output_columns if c.address not in query.hidden_columns
     ]
 
     mapping = {x.address: x for x in cte.output_columns}
@@ -587,9 +585,10 @@ def sort_select_output(
 ) -> CTE | UnionCTE:
     if isinstance(query, ProcessedQuery):
         return sort_select_output_processed(cte, query)
-    hidden_addresses = [c.address for c in query.hidden_components]
     output_addresses = [
-        c.address for c in query.output_components if c.address not in hidden_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}

trilogy/core/query_processor.py

@@ -500,7 +500,7 @@ def process_query(
     deduped_ctes: List[CTE | UnionCTE] = list(seen.values())
     root_cte.order_by = statement.order_by
     root_cte.limit = statement.limit
-    root_cte.hidden_concepts = [x for x in statement.hidden_components]
+    root_cte.hidden_concepts = statement.hidden_components
 
     final_ctes = optimize_ctes(deduped_ctes, root_cte, statement)
     return ProcessedQuery(
@@ -514,6 +514,6 @@ def process_query(
         base=root_cte,
         # we no longer do any joins at final level, this should always happen in parent CTEs
         joins=[],
-        hidden_columns=[x for x in statement.hidden_components],
+        hidden_columns=set([x for x in statement.hidden_components]),
         local_concepts=statement.local_concepts,
     )

trilogy/dialect/base.py

@@ -249,7 +249,9 @@ def safe_get_cte_value(coalesce, cte: CTE | UnionCTE, c: Concept, quote_char: st
     if isinstance(raw, list) and len(raw) == 1:
         rendered = cte.get_alias(c, raw[0])
         return f"{raw[0]}.{safe_quote(rendered, quote_char)}"
-    return coalesce([f"{x}.{safe_quote(cte.get_alias(c, x), quote_char)}" for x in raw])
+    return coalesce(
+        sorted([f"{x}.{safe_quote(cte.get_alias(c, x), quote_char)}" for x in raw])
+    )
 
 
 class BaseDialect:
@@ -658,7 +660,7 @@ class BaseDialect:
                 self.render_concept_sql(c, cte)
                 for c in cte.output_columns
                 if c.address not in [y.address for y in cte.join_derived_concepts]
-                and c.address not in [y.address for y in cte.hidden_concepts]
+                and c.address not in cte.hidden_concepts
             ] + [
                 f"{self.QUOTE_CHARACTER}{c.safe_address}{self.QUOTE_CHARACTER}"
                 for c in cte.join_derived_concepts
@@ -668,7 +670,7 @@ class BaseDialect:
             select_columns = [
                 self.render_concept_sql(c, cte)
                 for c in cte.output_columns
-                if c.address not in [y.address for y in cte.hidden_concepts]
+                if c.address not in cte.hidden_concepts
             ]
         if auto_sort:
             select_columns = sorted(select_columns, key=lambda x: x)
@@ -884,9 +886,10 @@ class BaseDialect:
         select_columns: Dict[str, str] = {}
         cte_output_map = {}
         selected = set()
-        hidden_addresses = [c.address for c in query.hidden_columns]
         output_addresses = [
-            c.address for c in query.output_columns if c.address not in hidden_addresses
+            c.address
+            for c in query.output_columns
+            if c.address not in query.hidden_columns
         ]
 
         for c in query.base.output_columns:
@@ -895,7 +898,7 @@ class BaseDialect:
                     f"{query.base.name}.{safe_quote(c.safe_address, self.QUOTE_CHARACTER)}"
                 )
                 cte_output_map[c.address] = query.base
-                if c.address not in hidden_addresses:
+                if c.address not in query.hidden_columns:
                     selected.add(c.address)
         if not all([x in selected for x in output_addresses]):
             missing = [x for x in output_addresses if x not in selected]

trilogy/utility.py

@@ -1,5 +1,5 @@
 import hashlib
-from typing import Any, Callable, List, Union
+from typing import Callable, List, TypeVar, Union
 
 from trilogy.constants import DEFAULT_NAMESPACE
 
@@ -12,7 +12,10 @@ def string_to_hash(input: str) -> int:
     )
 
 
-def unique(inputs: List, property: Union[str, Callable]) -> List[Any]:
+UniqueArg = TypeVar("UniqueArg")
+
+
+def unique(inputs: List[UniqueArg], property: Union[str, Callable]) -> List[UniqueArg]:
     final = []
     dedupe = set()
     if isinstance(property, str):