pytrilogy 0.0.2.14__py3-none-any.whl → 0.0.2.17__py3-none-any.whl

{pytrilogy-0.0.2.14.dist-info → pytrilogy-0.0.2.17.dist-info}/METADATA

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

{pytrilogy-0.0.2.14.dist-info → pytrilogy-0.0.2.17.dist-info}/RECORD

@@ -1,8 +1,8 @@
-trilogy/__init__.py,sha256=PE4Dy9UVhAPcaUZRWLaQUxC1U27eYhtTOKd-DOtVDh8,291
+trilogy/__init__.py,sha256=nBRkHW4Ndpv-I3-gUX1LDgrm4e5zxD2GFDWRZjwJ7A8,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=Ijos7_TEajKhZ7OJ_TreEYFddW1V33AVymDDrxP-ZHk,1234
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
-trilogy/executor.py,sha256=PZr7IF8wS1Oi2WJGE-B3lp70Y8ue2uuauODw02chjdQ,11175
+trilogy/executor.py,sha256=An6YLpHQOt96E7ozRQhwZels2hMsDbh0WV767kKCGU0,11294
 trilogy/parser.py,sha256=UtuqSiGiCjpMAYgo1bvNq-b7NSzCA5hzbUW31RXaMII,281
 trilogy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/utility.py,sha256=zM__8r29EsyDW7K9VOHz8yvZC2bXFzh7xKy3cL7GKsk,707
@@ -16,7 +16,7 @@ trilogy/core/exceptions.py,sha256=NvV_4qLOgKXbpotgRf7c8BANDEvHxlqRPaA53IThQ2o,56
 trilogy/core/functions.py,sha256=ARJAyBjeS415-54k3G_bx807rkPZonEulMaLRxSP7vU,10371
 trilogy/core/graph_models.py,sha256=oJUMSpmYhqXlavckHLpR07GJxuQ8dZ1VbB1fB0KaS8c,2036
 trilogy/core/internal.py,sha256=jNGFHKENnbMiMCtAgsnLZYVSENDK4b5ALecXFZpTDzQ,1075
-trilogy/core/models.py,sha256=bWCklm8A9I0vx8fXWoN0jKJjLkXuyMUUQetT_zbhyRc,149031
+trilogy/core/models.py,sha256=j55CLTR-vADhDd0va3maMPgNW4fj9GVJ8Kx5S25vu3w,149259
 trilogy/core/optimization.py,sha256=7E-Ol51u6ZAxF56F_bzLxgRO-Hu6Yl1ZbPopZJB2tqk,7533
 trilogy/core/query_processor.py,sha256=qMVkaK1Lvr9jEftJwAidMdkb_tRx12G07qynEyl91C8,18801
 trilogy/core/optimizations/__init__.py,sha256=bWQecbeiwiDx9LJnLsa7dkWxdbl2wcnkcTN69JyP8iI,356
@@ -31,12 +31,12 @@ trilogy/core/processing/utility.py,sha256=jFLZmzxHq94q29FInr8XjS5YiqJOPPBYqh8Tlg
 trilogy/core/processing/node_generators/__init__.py,sha256=-mzYkRsaRNa_dfTckYkKVFSR8h8a3ihEiPJDU_tAmDo,672
 trilogy/core/processing/node_generators/basic_node.py,sha256=IHj5jEloUe5yojGRLAzt35FcfHqGviWQdS8ETyvr39Q,3292
 trilogy/core/processing/node_generators/common.py,sha256=3_Ivrq_wersDZ5pnvyHvsAUc07mRggxRGTiDq47O0Rk,8840
-trilogy/core/processing/node_generators/filter_node.py,sha256=Tq9_Q6Xe95_-0S5H1EfCgwmKwVfXNoiclqV8QHKhvig,7723
+trilogy/core/processing/node_generators/filter_node.py,sha256=gCiv76Cu4idkZRyGkZG44BO50mTqrxYdUSDcZdpd0i4,7724
 trilogy/core/processing/node_generators/group_node.py,sha256=G7SrU2X5kjgzeqzzpnPscQBTDcFMc4m7TR6n8VHLC_A,3762
 trilogy/core/processing/node_generators/group_to_node.py,sha256=yX0uw6YMxhyWVRMZoMFzEkJe3tB5ByFqrTnuRWVcRh4,2446
 trilogy/core/processing/node_generators/multiselect_node.py,sha256=OUjndYjA8xR6yKr-J7R-JxDeYfO6DxmMNNcJiFJzk7g,6138
 trilogy/core/processing/node_generators/node_merge_node.py,sha256=D_jsnfoLMrQc08_JvT0wEDvjyzJAxBpdcZFyDN-feV0,13192
-trilogy/core/processing/node_generators/rowset_node.py,sha256=qYt0Ngk-WpmAA_gZZORXR-WpLdFqyYAuJiZnrxBmNvw,4201
+trilogy/core/processing/node_generators/rowset_node.py,sha256=tc8jt9bMq_HIdLM24sx_ivc7tTlpucQDEvsC2nkOtrY,4454
 trilogy/core/processing/node_generators/select_node.py,sha256=XSMA4kvFdoXlfCpbciXXkbexXkemwUorcAU6P3EwuZY,19843
 trilogy/core/processing/node_generators/unnest_node.py,sha256=aZeixbOzMtXi7BPahKr9bOkIhTciyD9Klsj0kZ56F6s,2189
 trilogy/core/processing/node_generators/window_node.py,sha256=LSlXe41elFGVRlxRX3MEFimhduGn3o5WE0kLx2JtA4M,3322
@@ -49,9 +49,9 @@ trilogy/core/processing/nodes/select_node_v2.py,sha256=yoU2PWu-BkiUDECd7V7CKAPjz
 trilogy/core/processing/nodes/unnest_node.py,sha256=mAmFluzm2yeeiQ6NfIB7BU_8atRGh-UJfPf9ROwbhr8,2152
 trilogy/core/processing/nodes/window_node.py,sha256=X7qxLUKd3tekjUUsmH_4vz5b-U89gMnGd04VBxuu2Ns,1280
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=kQek_ufZC9HDVOKlWasvIx6xyew8wv3JNIU6r53_IR4,32842
+trilogy/dialect/base.py,sha256=CcLIEqjRYSbxiCQWIjcn0XYb_jXvjY65-SeGAdIFioQ,32888
 trilogy/dialect/bigquery.py,sha256=15KJ-cOpBlk9O7FPviPgmg8xIydJeKx7WfmL3SSsPE8,2953
-trilogy/dialect/common.py,sha256=QCsqo5morOOL6kwaCYh1RBmaInaoPI6lKtzdgroWvuM,3440
+trilogy/dialect/common.py,sha256=Hr0mxcNxjSvhpBM5Wvb_Q7aklAuYj5aBDrW433py0Zs,4403
 trilogy/dialect/config.py,sha256=tLVEMctaTDhUgARKXUNfHUcIolGaALkQ0RavUvXAY4w,2994
 trilogy/dialect/duckdb.py,sha256=u_gpL35kouWxoBLas1h0ABYY2QzlVtEh22hm5h0lCOM,3182
 trilogy/dialect/enums.py,sha256=4NdpsydBpDn6jnh0JzFz5VvQEtnShErWtWHVyT6TNpw,3948
@@ -69,14 +69,14 @@ trilogy/parsing/common.py,sha256=-4LM71ocidA8DI2RngqFEOmhzBrIt8VdBTO4x2BpD8E,950
 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
-trilogy/parsing/parse_engine.py,sha256=_DNpdZOQoZZio_mW8nxcCKoJHny7hnQQtOGG1msoCFU,63265
-trilogy/parsing/render.py,sha256=Gy_6wVYPwYLf35Iota08sbqveuWILtUhI8MYStcvtJM,12174
-trilogy/parsing/trilogy.lark,sha256=-9y4oVAIlKi-6pE58G4RwGGTBeG7P3T_V4gV8mILd8w,11549
+trilogy/parsing/parse_engine.py,sha256=w-O1UNA7IMeYZPRB-bK1G-qM3nmM_mrQ-eVGSCkyIvM,63265
+trilogy/parsing/render.py,sha256=8yxerPAi4AhlhPBlAfbYbOM3F9rz6HzpWVEWPtK2VEg,12321
+trilogy/parsing/trilogy.lark,sha256=MFPDmqF0IntySCe7u8ZrLhoyzYYon4dYhnNRdERtEew,11583
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.14.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.14.dist-info/METADATA,sha256=MqQy1FLZVBpbDh36uTVMwYujLjDB4JkYdz9r5cytOgA,7907
-pytrilogy-0.0.2.14.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-pytrilogy-0.0.2.14.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.14.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.14.dist-info/RECORD,,
+pytrilogy-0.0.2.17.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.17.dist-info/METADATA,sha256=Qy6SlBRVmnn77Iq8QubcjHFBhhRpT0FN16RMXtODzVA,7907
+pytrilogy-0.0.2.17.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+pytrilogy-0.0.2.17.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.17.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.17.dist-info/RECORD,,

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.14"
+__version__ = "0.0.2.17"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models.py

@@ -2660,9 +2660,9 @@ class CTE(BaseModel):
             if isinstance(join, InstantiatedUnnestJoin):
                 continue
             if join.left_cte.name == parent.name:
-                join.left_cte = ds_being_inlined
+                join.inline_cte(parent)
             if join.right_cte.name == parent.name:
-                join.right_cte = ds_being_inlined
+                join.inline_cte(parent)
         for k, v in self.source_map.items():
             if isinstance(v, list):
                 self.source_map[k] = [
@@ -2885,34 +2885,38 @@ class JoinKey(BaseModel):
 
 
 class Join(BaseModel):
-    left_cte: CTE | Datasource
-    right_cte: CTE | Datasource
+    left_cte: CTE
+    right_cte: CTE
     jointype: JoinType
     joinkeys: List[JoinKey]
     joinkey_pairs: List[ConceptPair] | None = None
+    inlined_ctes: set[str] = Field(default_factory=set)
+
+    def inline_cte(self, cte: CTE):
+        self.inlined_ctes.add(cte.name)
 
     @property
     def left_name(self) -> str:
-        if isinstance(self.left_cte, Datasource):
-            return self.left_cte.identifier
+        if self.left_cte.name in self.inlined_ctes:
+            return self.left_cte.source.datasources[0].identifier
         return self.left_cte.name
 
     @property
     def right_name(self) -> str:
-        if isinstance(self.right_cte, Datasource):
-            return self.right_cte.identifier
+        if self.right_cte.name in self.inlined_ctes:
+            return self.right_cte.source.datasources[0].identifier
         return self.right_cte.name
 
     @property
     def left_ref(self) -> str:
-        if isinstance(self.left_cte, Datasource):
-            return f"{self.left_cte.safe_location} as {self.left_cte.identifier}"
+        if self.left_cte.name in self.inlined_ctes:
+            return f"{self.left_cte.source.datasources[0].safe_location} as {self.left_cte.source.datasources[0].identifier}"
         return self.left_cte.name
 
     @property
     def right_ref(self) -> str:
-        if isinstance(self.right_cte, Datasource):
-            return f"{self.right_cte.safe_location} as {self.right_cte.identifier}"
+        if self.right_cte.name in self.inlined_ctes:
+            return f"{self.right_cte.source.datasources[0].safe_location} as {self.right_cte.source.datasources[0].identifier}"
         return self.right_cte.name
 
     @property

trilogy/core/processing/node_generators/filter_node.py

@@ -212,5 +212,5 @@ def gen_filter_node(
             # this node fetches only what we need to filter
             filter_node,
             enrich_node,
-        ]
+        ],
     )

trilogy/core/processing/node_generators/rowset_node.py

@@ -71,12 +71,22 @@ def gen_rowset_node(
         and x.derivation != PurposeLineage.ROWSET
     ]
     node.hide_output_concepts(final_hidden)
-    # assume grain to be output of select
-    # but don't include anything aggregate at this point
-    assert node.resolution_cache
 
+    assert node.resolution_cache
+    # assume grain to be output of select
+    # but don't include anything hidden(the non-rowset concepts)
     node.grain = concept_list_to_grain(
-        node.output_concepts, parent_sources=node.resolution_cache.datasources
+        [
+            x
+            for x in node.output_concepts
+            if x.address
+            not in [
+                y.address
+                for y in node.hidden_concepts
+                if y.derivation != PurposeLineage.ROWSET
+            ]
+        ],
+        parent_sources=node.resolution_cache.datasources,
     )
 
     node.rebuild_cache()

trilogy/dialect/base.py

@@ -608,6 +608,7 @@ class BaseDialect:
                             join,
                             self.QUOTE_CHARACTER,
                             self.render_concept_sql,
+                            self.render_expr,
                             cte,
                             self.UNNEST_MODE,
                         )

trilogy/dialect/common.py

@@ -1,6 +1,13 @@
-from trilogy.core.models import Join, InstantiatedUnnestJoin, CTE, Concept, Datasource
+from trilogy.core.models import (
+    Join,
+    InstantiatedUnnestJoin,
+    CTE,
+    Concept,
+    Function,
+    RawColumnExpr,
+)
 from trilogy.core.enums import UnnestMode, Modifier
-from typing import Optional, Callable
+from typing import Callable
 
 
 def null_wrapper(lval: str, rval: str, modifiers: list[Modifier]) -> str:
@@ -21,19 +28,39 @@ def render_unnest(
     return f"{render_func(concept, cte, False)} as unnest_wrapper ({quote_character}{concept.safe_address}{quote_character})"
 
 
+def render_join_concept(
+    name: str,
+    quote_character: str,
+    cte: CTE,
+    concept: Concept,
+    render_expr,
+    inlined_ctes: set[str],
+):
+    if cte.name in inlined_ctes:
+        ds = cte.source.datasources[0]
+        raw_content = ds.get_alias(concept)
+        if isinstance(raw_content, RawColumnExpr):
+            rval = raw_content.text
+            return rval
+        elif isinstance(raw_content, Function):
+            rval = render_expr(raw_content, cte=cte)
+            return rval
+        return f"{name}.{quote_character}{raw_content}{quote_character}"
+    return f"{name}.{quote_character}{concept.safe_address}{quote_character}"
+
+
 def render_join(
     join: Join | InstantiatedUnnestJoin,
     quote_character: str,
-    render_func: Optional[Callable[[Concept, CTE, bool], str]] = None,
-    cte: Optional[CTE] = None,
+    render_func: Callable[[Concept, CTE, bool], str],
+    render_expr_func: Callable[[Concept, CTE], str],
+    cte: CTE,
     unnest_mode: UnnestMode = UnnestMode.CROSS_APPLY,
 ) -> str | None:
     # {% for key in join.joinkeys %}{{ key.inner }} = {{ key.outer}}{% endfor %}
     if isinstance(join, InstantiatedUnnestJoin):
         if unnest_mode == UnnestMode.DIRECT:
             return None
-        if not render_func:
-            raise ValueError("must provide a render function to build an unnest joins")
         if not cte:
             raise ValueError("must provide a cte to build an unnest joins")
         if unnest_mode == UnnestMode.CROSS_JOIN:
@@ -46,8 +73,22 @@ def render_join(
     right_base = join.right_ref
     base_joinkeys = [
         null_wrapper(
-            f"{left_name}.{quote_character}{join.left_cte.get_alias(key.concept) if isinstance(join.left_cte, Datasource) else key.concept.safe_address}{quote_character}",
-            f"{right_name}.{quote_character}{join.right_cte.get_alias(key.concept) if isinstance(join.right_cte, Datasource) else key.concept.safe_address}{quote_character}",
+            render_join_concept(
+                left_name,
+                quote_character,
+                join.left_cte,
+                key.concept,
+                render_expr_func,
+                join.inlined_ctes,
+            ),
+            render_join_concept(
+                right_name,
+                quote_character,
+                join.right_cte,
+                key.concept,
+                render_expr_func,
+                join.inlined_ctes,
+            ),
             modifiers=key.concept.modifiers or [],
         )
         for key in join.joinkeys
@@ -56,8 +97,22 @@ def render_join(
         base_joinkeys.extend(
             [
                 null_wrapper(
-                    f"{left_name}.{quote_character}{join.left_cte.get_alias(pair.left) if isinstance(join.left_cte, Datasource) else pair.left.safe_address}{quote_character}",
-                    f"{right_name}.{quote_character}{join.right_cte.get_alias(pair.right) if isinstance(join.right_cte, Datasource) else pair.right.safe_address}{quote_character}",
+                    render_join_concept(
+                        left_name,
+                        quote_character,
+                        join.left_cte,
+                        pair.left,
+                        render_expr_func,
+                        join.inlined_ctes,
+                    ),
+                    render_join_concept(
+                        right_name,
+                        quote_character,
+                        join.right_cte,
+                        pair.right,
+                        render_expr_func,
+                        join.inlined_ctes,
+                    ),
                     modifiers=pair.modifiers
                     + (pair.left.modifiers or [])
                     + (pair.right.modifiers or []),

trilogy/executor.py

@@ -129,6 +129,11 @@ class Executor(object):
             ["name"],
         )
 
+    @execute_query.register
+    def _(self, query: str) -> CursorResult:
+
+        return self.execute_text(query)[-1]
+
     @execute_query.register
     def _(self, query: SelectStatement) -> CursorResult:
         sql = self.generator.generate_queries(

trilogy/parsing/parse_engine.py

@@ -600,7 +600,7 @@ class ParseToObjects(Transformer):
         return args[3:-3]
 
     def raw_column_assignment(self, args):
-        return RawColumnExpr(text=args[0])
+        return RawColumnExpr(text=args[1])
 
     @v_args(meta=True)
     def datasource(self, meta: Meta, args):

trilogy/parsing/render.py

@@ -328,6 +328,8 @@ class Renderer:
         inputs = ",".join(self.to_string(c) for c in arg.arguments)
         if arg.operator == FunctionType.CONSTANT:
             return f"{inputs}"
+        if arg.operator == FunctionType.INDEX_ACCESS:
+            return f"{self.to_string(arg.arguments[0])}[{self.to_string(arg.arguments[1])}]"
         return f"{arg.operator.value}({inputs})"
 
     @to_string.register

trilogy/parsing/trilogy.lark

@@ -47,9 +47,11 @@
     
     //column_assignment
     //figure out if we want static
-    column_assignment: ((IDENTIFIER | _static_functions | raw_column_assignment ) ":" concept_assignment) 
+    column_assignment: (raw_column_assignment | IDENTIFIER |  _static_functions  ) ":" concept_assignment
+    
+    RAW_ENTRY.1: /raw\s*\(/s
 
-    raw_column_assignment: "raw" "(" MULTILINE_STRING ")"
+    raw_column_assignment: RAW_ENTRY  MULTILINE_STRING ")"
     
     column_assignment_list : column_assignment (","  column_assignment)* ","?