pytrilogy 0.0.2.23__tar.gz → 0.0.2.25__tar.gz

{pytrilogy-0.0.2.23/pytrilogy.egg-info → pytrilogy-0.0.2.25}/PKG-INFO

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

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.25/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.25}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.executor import Executor
 from trilogy.parser import parse
 from trilogy.constants import CONFIG
 
-__version__ = "0.0.2.23"
+__version__ = "0.0.2.25"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.25}/trilogy/core/env_processor.py

@@ -6,17 +6,20 @@ from trilogy.core.graph_models import (
 from trilogy.core.models import Environment, Concept, Datasource
 
 
-def add_concept(concept: Concept, g: ReferenceGraph):
+def add_concept(
+    concept: Concept, g: ReferenceGraph, concept_mapping: dict[str, Concept]
+):
     g.add_node(concept)
     # if we have sources, recursively add them
     node_name = concept_to_node(concept)
     if concept.concept_arguments:
         for source in concept.concept_arguments:
             generic = source.with_default_grain()
-            add_concept(generic, g)
+            add_concept(generic, g, concept_mapping)
 
             g.add_edge(generic, node_name)
-    for _, pseudonym in concept.pseudonyms.items():
+    for ps_address in concept.pseudonyms:
+        pseudonym = concept_mapping[ps_address]
         pseudonym = pseudonym.with_default_grain()
         pseudonym_node = concept_to_node(pseudonym)
         if (pseudonym_node, node_name) in g.edges and (
@@ -28,7 +31,7 @@ def add_concept(concept: Concept, g: ReferenceGraph):
             continue
         g.add_edge(pseudonym_node, node_name, pseudonym=True)
         g.add_edge(node_name, pseudonym_node, pseudonym=True)
-        add_concept(pseudonym, g)
+        add_concept(pseudonym, g, concept_mapping)
 
 
 def generate_adhoc_graph(
@@ -37,10 +40,11 @@ def generate_adhoc_graph(
     restrict_to_listed: bool = False,
 ) -> ReferenceGraph:
     g = ReferenceGraph()
+    concept_mapping = {x.address: x for x in concepts}
 
     # add all parsed concepts
     for concept in concepts:
-        add_concept(concept, g)
+        add_concept(concept, g, concept_mapping)
 
     for dataset in datasources:
         node = datasource_to_node(dataset)
@@ -66,5 +70,7 @@ def generate_graph(
 ) -> ReferenceGraph:
 
     return generate_adhoc_graph(
-        list(environment.concepts.values()), list(environment.datasources.values())
+        list(environment.concepts.values())
+        + list(environment.alias_origin_lookup.values()),
+        list(environment.datasources.values()),
     )

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.25}/trilogy/core/environment_helpers.py

@@ -191,4 +191,3 @@ def generate_related_concepts(
             environment.add_concept(auto, meta=meta)
             if isinstance(value, Concept):
                 environment.merge_concept(auto, value, modifiers=[])
-                assert value.pseudonyms is not None

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.25}/trilogy/core/models.py

@@ -102,6 +102,12 @@ def get_version():
     return __version__
 
 
+def address_with_namespace(address: str, namespace: str) -> str:
+    if address.split(".", 1)[0] == DEFAULT_NAMESPACE:
+        return f"{namespace}.{address.split('.',1)[1]}"
+    return f"{namespace}.{address}"
+
+
 def get_concept_arguments(expr) -> List["Concept"]:
     output = []
     if isinstance(expr, Concept):
@@ -436,7 +442,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
     keys: Optional[Tuple["Concept", ...]] = None
     grain: "Grain" = Field(default=None, validate_default=True)
     modifiers: Optional[List[Modifier]] = Field(default_factory=list)
-    pseudonyms: Dict[str, Concept] = Field(default_factory=dict)
+    pseudonyms: set[str] = Field(default_factory=set)
     _address_cache: str | None = None
 
     def __hash__(self):
@@ -462,7 +468,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
     def with_merge(self, source: Concept, target: Concept, modifiers: List[Modifier]):
         if self.address == source.address:
             new = target.with_grain(self.grain.with_merge(source, target, modifiers))
-            new.pseudonyms[self.address] = self
+            new.pseudonyms.add(self.address)
             return new
         return self.__class__(
             name=self.name,
@@ -616,9 +622,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
                 else None
             ),
             modifiers=self.modifiers,
-            pseudonyms={
-                k: v.with_namespace(namespace) for k, v in self.pseudonyms.items()
-            },
+            pseudonyms={address_with_namespace(v, namespace) for v in self.pseudonyms},
         )
 
     def with_select_context(
@@ -862,7 +866,7 @@ class Grain(Mergeable, BaseModel):
             )
         else:
             v2 = unique(v, "address")
-        final = []
+        final: List[Concept] = []
         for sub in v2:
             if sub.purpose in (Purpose.PROPERTY, Purpose.METRIC) and sub.keys:
                 if all([c in v2 for c in sub.keys]):
@@ -916,6 +920,20 @@ class Grain(Mergeable, BaseModel):
             [c.name == ALL_ROWS_CONCEPT for c in self.components]
         )
 
+    @property
+    def synonym_set(self) -> set[str]:
+        base = []
+        for x in self.components_copy:
+            if isinstance(x.lineage, RowsetItem):
+                base.append(x.lineage.content.address)
+                for c in x.lineage.content.pseudonyms:
+                    base.append(c)
+            else:
+                base.append(x.address)
+                for c in x.pseudonyms:
+                    base.append(c)
+        return set(base)
+
     @cached_property
     def set(self) -> set[str]:
         base = []
@@ -931,7 +949,11 @@ class Grain(Mergeable, BaseModel):
             return self.set == set([c.address for c in other])
         if not isinstance(other, Grain):
             return False
-        return self.set == other.set
+        if self.set == other.set:
+            return True
+        elif self.synonym_set == other.synonym_set:
+            return True
+        return False
 
     def issubset(self, other: "Grain"):
         return self.set.issubset(other.set)
@@ -1584,13 +1606,6 @@ class RawSQLStatement(BaseModel):
     meta: Optional[Metadata] = Field(default_factory=lambda: Metadata())
 
 
-class CopyStatement(BaseModel):
-    target: str
-    target_type: IOType
-    meta: Optional[Metadata] = Field(default_factory=lambda: Metadata())
-    select: SelectStatement
-
-
 class SelectStatement(Mergeable, Namespaced, SelectTypeMixin, BaseModel):
     selection: List[SelectItem]
     order_by: Optional[OrderBy] = None
@@ -1789,6 +1804,16 @@ class SelectStatement(Mergeable, Namespaced, SelectTypeMixin, BaseModel):
         )
 
 
+class CopyStatement(BaseModel):
+    target: str
+    target_type: IOType
+    meta: Optional[Metadata] = Field(default_factory=lambda: Metadata())
+    select: SelectStatement
+
+    def refresh_bindings(self, environment: Environment):
+        self.select.refresh_bindings(environment)
+
+
 class AlignItem(Namespaced, BaseModel):
     alias: str
     concepts: List[Concept]
@@ -2259,7 +2284,7 @@ class BaseJoin(BaseModel):
             for ds in [self.left_datasource, self.right_datasource]:
                 synonyms = []
                 for c in ds.output_concepts:
-                    synonyms += list(c.pseudonyms.keys())
+                    synonyms += list(c.pseudonyms)
                 if (
                     concept.address not in [c.address for c in ds.output_concepts]
                     and concept.address not in synonyms
@@ -2834,9 +2859,21 @@ class CTE(BaseModel):
             return self.parent_ctes[0].name
         return self.name
 
+    def get_concept(self, address: str) -> Concept | None:
+        for cte in self.parent_ctes:
+            if address in cte.output_columns:
+                match = [x for x in cte.output_columns if x.address == address].pop()
+                return match
+
+        for array in [self.source.input_concepts, self.source.output_concepts]:
+            match_list = [x for x in array if x.address == address]
+            if match_list:
+                return match_list.pop()
+        return None
+
     def get_alias(self, concept: Concept, source: str | None = None) -> str:
         for cte in self.parent_ctes:
-            if concept.address in [x.address for x in cte.output_columns]:
+            if concept.address in cte.output_columns:
                 if source and source != cte.name:
                     continue
                 return concept.safe_address
@@ -2988,7 +3025,7 @@ class UndefinedConcept(Concept, Mergeable, Namespaced):
     ) -> "UndefinedConcept" | Concept:
         if self.address == source.address:
             new = target.with_grain(self.grain.with_merge(source, target, modifiers))
-            new.pseudonyms[self.address] = self
+            new.pseudonyms.add(self.address)
             return new
         return self.__class__(
             name=self.name,
@@ -3520,6 +3557,7 @@ class Environment(BaseModel):
         self, source: Concept, target: Concept, modifiers: List[Modifier]
     ):
         replacements = {}
+
         # exit early if we've run this
         if source.address in self.alias_origin_lookup:
             if self.concepts[source.address] == target:
@@ -3528,11 +3566,11 @@ class Environment(BaseModel):
         for k, v in self.concepts.items():
 
             if v.address == target.address:
-                v.pseudonyms[source.address] = source
+                v.pseudonyms.add(source.address)
             if v.address == source.address:
                 replacements[k] = target
                 self.canonical_map[k] = target.address
-                v.pseudonyms[target.address] = target
+                v.pseudonyms.add(target.address)
             # we need to update keys and grains of all concepts
             else:
                 replacements[k] = v.with_merge(source, target, modifiers)

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.25}/trilogy/core/processing/concept_strategies_v3.py

@@ -455,7 +455,20 @@ def generate_node(
                         if x.address not in [y.address for y in root_targets]
                         and x not in ex_resolve.grain.components
                     ]
-                    expanded.set_output_concepts(root_targets)
+
+                    pseudonyms = [
+                        x
+                        for x in extra
+                        if any(x.address in y.pseudonyms for y in root_targets)
+                    ]
+                    # if we're only connected by a pseudonym, keep those in output
+                    expanded.set_output_concepts(root_targets + pseudonyms)
+                    # but hide them
+                    if pseudonyms:
+                        logger.info(
+                            f"{depth_to_prefix(depth)}{LOGGER_PREFIX} Hiding pseudonyms{[c.address for c in pseudonyms]}"
+                        )
+                        expanded.hide_output_concepts(pseudonyms)
 
                     logger.info(
                         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]}"
@@ -480,6 +493,7 @@ def validate_concept(
     found_map: dict[str, set[Concept]],
     accept_partial: bool,
     seen: set[str],
+    environment: Environment,
 ):
 
     found_map[str(node)].add(concept)
@@ -500,10 +514,11 @@ def validate_concept(
         if accept_partial:
             found_addresses.add(concept.address)
             found_map[str(node)].add(concept)
-    for _, v in concept.pseudonyms.items():
-        if v.address == concept.address:
+    for v_address in concept.pseudonyms:
+        v = environment.concepts[v_address]
+        if v == concept.address:
             return
-        if v.address in seen:
+        if v in seen:
             return
         validate_concept(
             v,
@@ -515,10 +530,12 @@ def validate_concept(
             found_map,
             accept_partial,
             seen=seen,
+            environment=environment,
         )
 
 
 def validate_stack(
+    environment: Environment,
     stack: List[StrategyNode],
     concepts: List[Concept],
     mandatory_with_filter: List[Concept],
@@ -546,6 +563,7 @@ def validate_stack(
                 found_map,
                 accept_partial,
                 seen,
+                environment,
             )
         for concept in node.virtual_output_concepts:
             if concept.address in non_partial_addresses:
@@ -807,6 +825,7 @@ def _search_concepts(
                 break
         attempted.add(priority_concept.address)
         complete, found, missing, partial, virtual = validate_stack(
+            environment,
             stack,
             mandatory_list,
             completion_mandatory,

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.25}/trilogy/core/processing/node_generators/node_merge_node.py

@@ -209,9 +209,9 @@ def resolve_weak_components(
         for c in all_concepts
         if "__preql_internal" not in c.address
     ]
-    synonyms: list[Concept] = []
+    synonyms: set[str] = set()
     for x in all_concepts:
-        synonyms += x.pseudonyms.values()
+        synonyms = synonyms.union(x.pseudonyms)
     while break_flag is not True:
         count += 1
         if count > AMBIGUITY_CHECK_LIMIT:
@@ -385,9 +385,9 @@ def gen_merge_node(
     # one concept handling may need to be kicked to alias
     if len(all_concepts) == 1:
         concept = all_concepts[0]
-        for k, v in concept.pseudonyms.items():
+        for v in concept.pseudonyms:
             test = subgraphs_to_merge_node(
-                [[concept, v]],
+                [[concept, environment.alias_origin_lookup[v]]],
                 g=g,
                 all_concepts=[concept],
                 environment=environment,

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.25}/trilogy/core/processing/utility.py

@@ -162,17 +162,21 @@ def add_node_join_concept(
     concept: Concept,
     datasource: Datasource | QueryDatasource,
     concepts: List[Concept],
+    environment: Environment,
 ):
 
     concepts.append(concept)
 
     graph.add_node(concept.address, type=NodeType.CONCEPT)
     graph.add_edge(datasource.identifier, concept.address)
-    for _, v in concept.pseudonyms.items():
+    for v_address in concept.pseudonyms:
+        v = environment.alias_origin_lookup.get(
+            v_address, environment.concepts[v_address]
+        )
         if v in concepts:
             continue
-        if v.address != concept.address:
-            add_node_join_concept(graph, v, datasource, concepts)
+        if v != concept.address:
+            add_node_join_concept(graph, v, datasource, concepts, environment)
 
 
 def get_node_joins(
@@ -186,7 +190,7 @@ def get_node_joins(
     for datasource in datasources:
         graph.add_node(datasource.identifier, type=NodeType.NODE)
         for concept in datasource.output_concepts:
-            add_node_join_concept(graph, concept, datasource, concepts)
+            add_node_join_concept(graph, concept, datasource, concepts, environment)
 
     # add edges for every constant to every datasource
     for datasource in datasources:
@@ -195,7 +199,6 @@ def get_node_joins(
                 for node in graph.nodes:
                     if graph.nodes[node]["type"] == NodeType.NODE:
                         graph.add_edge(node, concept.address)
-
     joins: defaultdict[str, set] = defaultdict(set)
     identifier_map: dict[str, Datasource | QueryDatasource] = {
         x.identifier: x for x in datasources
@@ -206,7 +209,7 @@ def get_node_joins(
         # if we're looking up a pseudonym, we would have gotten the remapped value
         # so double check we got what we were looking for
         if env_lookup.address == g.address:
-            grain_pseudonyms.update(env_lookup.pseudonyms.keys())
+            grain_pseudonyms.update(env_lookup.pseudonyms)
 
     node_list = sorted(
         [x for x in graph.nodes if graph.nodes[x]["type"] == NodeType.NODE],

{pytrilogy-0.0.2.23 → pytrilogy-0.0.2.25}/trilogy/dialect/base.py

@@ -263,7 +263,11 @@ class BaseDialect:
     ) -> str:
         result = None
         if c.pseudonyms:
-            for candidate in [c] + list(c.pseudonyms.values()):
+            candidates = [y for y in [cte.get_concept(x) for x in c.pseudonyms] if y]
+            logger.debug(
+                f"{LOGGER_PREFIX} [{c.address}] pseudonym candidates are {[x.address for x in candidates]}"
+            )
+            for candidate in [c] + candidates:
                 try:
                     logger.debug(
                         f"{LOGGER_PREFIX} [{c.address}] Attempting rendering w/ candidate {candidate.address}"