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

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

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

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

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=KLYdc650VOIzjRZdH4baZEtSeBPReI5LTzjij3xENfE,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
@@ -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=hzClGgWxfqxnx4Nc0iIr_DwOybAnuk5RozCijqsZUg4,39168
+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,9 +43,10 @@ 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=lVjwxO71HVZ5De82bo7YYILVQ7cYeXdCzIloLCfpyLE,6112
+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=6KoxhmpVOTN3HGWT0FIS96xqlm2Inouw9VL2D_0kSg0,3481
@@ -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=H6eebtFV09edKbBpukxxB0xBftolXFhvXbshbZhNeUI,40290
+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
@@ -82,7 +83,7 @@ trilogy/hooks/graph_hook.py,sha256=c-vC-IXoJ_jDmKQjxQyIxyXPOuUcLIURB573gCsAfzQ,2
 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=b_TGP-cSV21Y8INI77DhD3c4kg0vpJ5TZUuzU-JcdaU,20594
+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
@@ -91,9 +92,9 @@ trilogy/parsing/render.py,sha256=o_XuQWhcwx1lD9eGVqkqZEwkmQK0HdmWWokGBtdeH4I,178
 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.1.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.3.1.dist-info/METADATA,sha256=HAkTZhYCZL5M6_WSWKakxXEHP5xqxSMMgKhM2E6HndE,8983
-pytrilogy-0.0.3.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pytrilogy-0.0.3.1.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.3.1.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.1.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.1"
+__version__ = "0.0.3.2"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

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}")

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,10 +51,17 @@ 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 v.address in lineage.rowset.derived_concepts
+        v for v in concept_pool if v.address in rowset_outputs
     ]
 
     select_hidden = node.hidden_concepts
@@ -69,7 +76,7 @@ def gen_rowset_node(
         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(
@@ -82,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
@@ -102,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/dialect/base.py

@@ -295,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,
@@ -303,7 +305,6 @@ class BaseDialect:
         cte: CTE | UnionCTE,
         alias: bool = True,
         raise_invalid: bool = False,
-        qualify: bool = True,
     ) -> str:
         result = None
         if c.pseudonyms:
@@ -317,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
@@ -325,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}"
@@ -336,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(
@@ -515,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):
@@ -639,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/parsing/common.py

@@ -539,9 +539,6 @@ def rowset_to_concepts(rowset: RowsetDerivationStatement, environment: Environme
     default_grain = Grain.from_concepts([*pre_output])
     # remap everything to the properties of the rowset
     for x in pre_output:
-        print("xxxx")
-        print(x.address)
-        print(x.grain)
         if x.keys:
             if all([k in orig for k in x.keys]):
                 x.keys = set([orig[k].address if k in orig else k for k in x.keys])