pytrilogy 0.0.2.57__tar.gz → 0.0.2.58__tar.gz

{pytrilogy-0.0.2.57/pytrilogy.egg-info → pytrilogy-0.0.2.58}/PKG-INFO

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

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/tests/test_select.py

@@ -123,7 +123,7 @@ def test_modifiers():
     ;"""
     env, parsed = parse(q1)
     select: SelectStatement = parsed[-1]
-    assert select.hidden_components == [env.concepts["b"]]
+    assert select.hidden_components == set([env.concepts["b"].address])
     assert select.output_components == [env.concepts["a"], env.concepts["b"]]
     query = process_query(statement=select, environment=env)
 

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

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/trilogy/core/models.py

@@ -1870,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
@@ -2104,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
 
 
@@ -2508,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
@@ -2660,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"
@@ -2761,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
@@ -2947,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"
         )
@@ -3132,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)
 
@@ -4504,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

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/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:

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/trilogy/core/processing/concept_strategies_v3.py

@@ -580,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,

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/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"),

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/trilogy/core/processing/node_generators/group_to_node.py

@@ -49,8 +49,8 @@ def gen_group_to_node(
         parents=parents,
         depth=depth,
         preexisting_conditions=conditions.conditional if conditions else None,
-        hidden_concepts=(
-            [group_arg]
+        hidden_concepts=set(
+            [group_arg.address]
             if isinstance(group_arg, Concept)
             and group_arg.address not in local_optional
             else []

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/trilogy/core/processing/node_generators/multiselect_node.py

@@ -116,7 +116,7 @@ def gen_multiselect_node(
         depth=depth,
         parents=base_parents,
         node_joins=node_joins,
-        hidden_concepts=[x for y in base_parents for x in y.hidden_concepts],
+        hidden_concepts=set([x for y in base_parents for x in y.hidden_concepts]),
     )
 
     enrichment = set([x.address for x in local_optional])

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/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
             ]
         ],
     )

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/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
@@ -281,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
@@ -388,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),
         )

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/trilogy/core/processing/nodes/group_node.py

@@ -48,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,
@@ -154,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,
@@ -191,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),
         )

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/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,
     ):
@@ -369,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,

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/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,

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/trilogy/core/processing/utility.py

@@ -347,7 +347,7 @@ 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 in datasource.hidden_concepts:
+            if concept.address in datasource.hidden_concepts:
                 continue
             add_node_join_concept(
                 graph=graph,
@@ -567,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}
@@ -586,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}

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/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,
     )

{pytrilogy-0.0.2.57 → pytrilogy-0.0.2.58}/trilogy/dialect/base.py

@@ -660,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
@@ -670,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)
@@ -886,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:
@@ -897,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]