pytrilogy 0.0.1.108__tar.gz → 0.0.1.109__tar.gz

{pytrilogy-0.0.1.108/pytrilogy.egg-info → pytrilogy-0.0.1.109}/PKG-INFO

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

{pytrilogy-0.0.1.108 → pytrilogy-0.0.1.109/pytrilogy.egg-info}/PKG-INFO

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

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

{pytrilogy-0.0.1.108 → pytrilogy-0.0.1.109}/trilogy/core/models.py

@@ -496,13 +496,31 @@ class Concept(Namespaced, SelectGrain, BaseModel):
     @property
     def sources(self) -> List["Concept"]:
         if self.lineage:
-            output = []
-            for item in self.lineage.arguments:
-                if isinstance(item, Concept):
-                    if item.address == self.address:
-                        raise SyntaxError(f"Concept {self.address} references itself")
-                    output.append(item)
-                    output += item.sources
+            output: List[Concept] = []
+
+            def get_sources(
+                expr: Union[
+                    Function,
+                    WindowItem,
+                    FilterItem,
+                    AggregateWrapper,
+                    RowsetItem,
+                    MultiSelectStatement | MergeStatement,
+                ],
+                output: List[Concept],
+            ):
+                for item in expr.arguments:
+                    if isinstance(item, Concept):
+                        if item.address == self.address:
+                            raise SyntaxError(
+                                f"Concept {self.address} references itself"
+                            )
+                        output.append(item)
+                        output += item.sources
+                    elif isinstance(item, Function):
+                        get_sources(item, output)
+
+            get_sources(self.lineage, output)
             return output
         return []
 

{pytrilogy-0.0.1.108 → pytrilogy-0.0.1.109}/trilogy/core/processing/node_generators/common.py

@@ -196,6 +196,7 @@ def gen_enrichment_node(
     log_lambda(
         f"{str(type(base_node).__name__)} returning merge node with group node + enrichment node"
     )
+
     return MergeNode(
         input_concepts=unique(
             join_keys + extra_required + base_node.output_concepts, "address"

{pytrilogy-0.0.1.108 → pytrilogy-0.0.1.109}/trilogy/core/processing/node_generators/rowset_node.py

@@ -10,7 +10,7 @@ from trilogy.core.processing.nodes import MergeNode, NodeJoin, History, Strategy
 from trilogy.core.processing.nodes.base_node import concept_list_to_grain
 from typing import List
 
-from trilogy.core.enums import JoinType
+from trilogy.core.enums import JoinType, PurposeLineage
 from trilogy.constants import logger
 from trilogy.core.processing.utility import padding
 from trilogy.core.processing.node_generators.common import concept_to_relevant_joins
@@ -53,7 +53,7 @@ def gen_rowset_node(
         return None
     node.conditions = select.where_clause.conditional if select.where_clause else None
     # rebuild any cached info with the new condition clause
-    node.rebuild_cache()
+
     enrichment = set([x.address for x in local_optional])
     rowset_relevant = [
         x
@@ -71,9 +71,15 @@ def gen_rowset_node(
     if select.where_clause:
         for item in additional_relevant:
             node.partial_concepts.append(item)
-
+    node.hidden_concepts = [
+        x
+        for x in node.output_concepts
+        if x.address not in [y.address for y in local_optional + [concept]]
+        and x.derivation != PurposeLineage.ROWSET
+    ]
     # assume grain to be output of select
     # but don't include anything aggregate at this point
+    node.rebuild_cache()
     assert node.resolution_cache
     node.resolution_cache.grain = concept_list_to_grain(
         node.output_concepts, parent_sources=node.resolution_cache.datasources

{pytrilogy-0.0.1.108 → pytrilogy-0.0.1.109}/trilogy/core/processing/nodes/base_node.py

@@ -184,6 +184,7 @@ class StrategyNode:
 
     def rebuild_cache(self) -> QueryDatasource:
         self.tainted = True
+        self.output_lcl = LooseConceptList(concepts=self.output_concepts)
         if not self.resolution_cache:
             return self.resolve()
         self.resolution_cache = None

{pytrilogy-0.0.1.108 → pytrilogy-0.0.1.109}/trilogy/core/processing/nodes/merge_node.py

@@ -207,6 +207,7 @@ class MergeNode(StrategyNode):
             joins = self.translate_node_joins(final_joins)
         else:
             return []
+
         for join in joins:
             logger.info(
                 f"{self.logging_prefix}{LOGGER_PREFIX} final join {join.join_type} {[str(c) for c in join.concepts]}"

{pytrilogy-0.0.1.108 → pytrilogy-0.0.1.109}/trilogy/parsing/parse_engine.py

@@ -981,13 +981,13 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def merge_statement(self, meta: Meta, args) -> MergeStatement:
-
         parsed = [self.environment.concepts[x] for x in args]
         datatypes = {x.datatype for x in parsed}
-        if not len(datatypes) == 1:
+        if not len(datatypes) == 1 and self.environment.concepts.fail_on_missing:
+            type_dict = {x.address: x.datatype for x in parsed}
             raise SyntaxError(
-                f"Cannot merge concepts with different datatypes {datatypes}"
-                f"line: {meta.line} concepts: {[x.address for x in parsed]}"
+                f"Cannot merge concepts with different datatype"
+                f"line: {meta.line} concepts: {type_dict}"
             )
         merge = MergeStatement(concepts=parsed, datatype=datatypes.pop())
         new = merge.merge_concept