pytrilogy 0.0.2.41__py3-none-any.whl → 0.0.2.43__py3-none-any.whl

{pytrilogy-0.0.2.41.dist-info → pytrilogy-0.0.2.43.dist-info}/METADATA

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

{pytrilogy-0.0.2.41.dist-info → pytrilogy-0.0.2.43.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=TkwxYmJ568eljR1wX8-wzP48QWvm0V6gSnZBN5DX-jk,291
+trilogy/__init__.py,sha256=ZEWVL1pix9g4txlIjL_AeU_gXI3663YOp9C-hV2cXeM,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=UPymm94T2c6a55XdDaXw0aleTe1pOJ6lf6gOWLKZyKg,1430
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
@@ -12,11 +12,11 @@ trilogy/core/enums.py,sha256=z-qBLh0YW52tkRtp6VLn6afxLfgI45r7_QfDtGH9CSw,6858
 trilogy/core/env_processor.py,sha256=SHVB3nkidIlFc5dz-sofRMKXx66stpLQNuVdQSjC-So,2586
 trilogy/core/environment_helpers.py,sha256=DIsoo-GcXmXVPB1JbNh8Oku25Nyef9mexPIdy2ur_sk,7159
 trilogy/core/ergonomics.py,sha256=ASLDd0RqKWrZiG3XcKHo8nyTjaB_8xfE9t4NZ1UvGpc,1639
-trilogy/core/exceptions.py,sha256=NvV_4qLOgKXbpotgRf7c8BANDEvHxlqRPaA53IThQ2o,561
+trilogy/core/exceptions.py,sha256=1c1lQCwSw4_5CQS3q7scOkXU8GQvullJXfPHubprl90,617
 trilogy/core/functions.py,sha256=IhVpt3n6wEanKHnGu3oA2w6-hKIlxWpEyz7fHN66mpo,10720
 trilogy/core/graph_models.py,sha256=mameUTiuCajtihDw_2-W218xyJlvTusOWrEKP1yAWgk,2003
 trilogy/core/internal.py,sha256=jNGFHKENnbMiMCtAgsnLZYVSENDK4b5ALecXFZpTDzQ,1075
-trilogy/core/models.py,sha256=5pUsZoiEHEFLvZTddpy-_u_2w_lH9tJIPe5lQH5Ru-s,163252
+trilogy/core/models.py,sha256=Fos3AY_biCCYh-Y9p-n9di8CJ9UvdxnNgiNTxYjlH-4,163631
 trilogy/core/optimization.py,sha256=VFSvJLNoCCOraip-PZUKeE4qrlxtXARjQUzJZiW-yRk,7325
 trilogy/core/query_processor.py,sha256=mbcZlgjChrRjDHkdmMbKe-T70UpbBkJhS09MyU5a6UY,17785
 trilogy/core/optimizations/__init__.py,sha256=bWQecbeiwiDx9LJnLsa7dkWxdbl2wcnkcTN69JyP8iI,356
@@ -38,9 +38,9 @@ trilogy/core/processing/node_generators/multiselect_node.py,sha256=_KO9lqzHQoy4V
 trilogy/core/processing/node_generators/node_merge_node.py,sha256=dIEv5P2MTViAES2MzqJgccYzM3HldjHrQYFwH00cqyc,14003
 trilogy/core/processing/node_generators/rowset_node.py,sha256=KtdN6t2xM8CJxobc4aQX4W8uX98U6IabeuBF_FtBLR4,4583
 trilogy/core/processing/node_generators/select_merge_node.py,sha256=UF4xra2sJ6dGg9TLJUgqtTX-UxqUaCEfAGo-uq7HlVs,12139
-trilogy/core/processing/node_generators/select_node.py,sha256=nwXHQF6C-aQUIelx9dyxN2pK3muL-4-6RIqnqQqNwtw,1808
+trilogy/core/processing/node_generators/select_node.py,sha256=xTCWOoucRPBWkTccm5wepidhuZix-wd0YXWyOsy8nLs,1795
 trilogy/core/processing/node_generators/unnest_node.py,sha256=cZ26CN338CBnd6asML1OBUtNcDzmNlFpY0Vnade4yrc,2256
-trilogy/core/processing/node_generators/window_node.py,sha256=Jfjjdvn8RqFzrQ1gZc6vS0Bsh_iTA5AmRZ0zLlT4574,3155
+trilogy/core/processing/node_generators/window_node.py,sha256=Ywb2K0T5Ym_Y4XStzIE2fuWV1fW2dp5eQ2hXVFTLsGM,3511
 trilogy/core/processing/nodes/__init__.py,sha256=qS5EJDRwwIrCEfS7ibCA2ESE0RPzsAIii1UWd_wNsHA,4760
 trilogy/core/processing/nodes/base_node.py,sha256=sc3HrXkWk-xpsAQ7B7ltX1ZejYAkqFiv8Ei8Jg5VGkQ,15579
 trilogy/core/processing/nodes/filter_node.py,sha256=GfZ9eghpFDI-s7iQP2UqTljCmn25LT_T5TAxDlh7PkQ,2343
@@ -50,7 +50,7 @@ trilogy/core/processing/nodes/select_node_v2.py,sha256=7WoFxeGEAzhpS4y4Zw2nH2tt7
 trilogy/core/processing/nodes/unnest_node.py,sha256=mAmFluzm2yeeiQ6NfIB7BU_8atRGh-UJfPf9ROwbhr8,2152
 trilogy/core/processing/nodes/window_node.py,sha256=ro0QfMFi4ZmIn5Q4D0M_vJWfnHH_C0MN7XkVkx8Gygg,1214
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=bevM9mUGSfwt_F-kJpi0nHmMRmE0pINqqvCteqnu5FM,34880
+trilogy/dialect/base.py,sha256=Aj0U5JUFPzBuo-5LNASYIkJVIYiMhL3A4nGEslY7xAg,36301
 trilogy/dialect/bigquery.py,sha256=15KJ-cOpBlk9O7FPviPgmg8xIydJeKx7WfmL3SSsPE8,2953
 trilogy/dialect/common.py,sha256=eqJi_Si1iyb2sV0siTf8g8JOHueWu6RkdtQZtutKazk,3826
 trilogy/dialect/config.py,sha256=tLVEMctaTDhUgARKXUNfHUcIolGaALkQ0RavUvXAY4w,2994
@@ -66,18 +66,18 @@ trilogy/hooks/graph_hook.py,sha256=onHvMQPwj_KOS3HOTpRFiy7QLLKAiycq2MzJ_Q0Oh5Y,2
 trilogy/hooks/query_debugger.py,sha256=787umJjdGA057DCC714dqFstzJRUbwmz3MNr66IdpQI,4404
 trilogy/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/parsing/common.py,sha256=_GW9LU6_4RuUgcdcr8EE1ybCRd-7cz3idZtjHZ66pYA,10182
+trilogy/parsing/common.py,sha256=3kly4cH36F_8nwR1evKB5_yk1ezEtwwoeav4PrHUJ6o,10417
 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=KMeHQf8iW-UKd4JstGgcoo6O3OZ14MaQW50g1PMjEEQ,65256
+trilogy/parsing/parse_engine.py,sha256=fWE_0n30ecBdlT6OvAZL5DYJRs-q2MiD-m8wqxQ_9XE,65201
 trilogy/parsing/render.py,sha256=-qqpXQg4yHcv284Vosjnsc_vrPveH6oaYbeCd3ZSvs0,15682
 trilogy/parsing/trilogy.lark,sha256=B6NM3-rBHtYB_WSEti0DiS8Z-I8YH3kZU47xNzQvBx4,12389
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.41.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.41.dist-info/METADATA,sha256=PGYuvWWThHh9Vucj7-eZIWLGu7db7pN7iVyXL9f42-Q,8426
-pytrilogy-0.0.2.41.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pytrilogy-0.0.2.41.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.41.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.41.dist-info/RECORD,,
+pytrilogy-0.0.2.43.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.43.dist-info/METADATA,sha256=Lx7C3ItHKIzLZwQ_nwBHpJrnYWyG3PR305v4SXcGzBs,8426
+pytrilogy-0.0.2.43.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+pytrilogy-0.0.2.43.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.43.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.43.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.41"
+__version__ = "0.0.2.43"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/exceptions.py

@@ -16,6 +16,10 @@ class NoDatasourceException(Exception):
     pass
 
 
+class FrozenEnvironmentException(Exception):
+    pass
+
+
 class AmbiguousRelationshipResolutionException(Exception):
     def __init__(self, message, parents: List[set[str]]):
         super().__init__(self, message)

trilogy/core/models.py

@@ -67,7 +67,10 @@ from trilogy.core.enums import (
     SelectFiltering,
     IOType,
 )
-from trilogy.core.exceptions import UndefinedConceptException, InvalidSyntaxException
+from trilogy.core.exceptions import (
+    UndefinedConceptException,
+    InvalidSyntaxException,
+)
 from trilogy.utility import unique
 from collections import UserList, UserDict
 from functools import cached_property
@@ -555,6 +558,8 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
             v = Grain(components=[])
         elif isinstance(v, Concept):
             v = Grain(components=[v])
+        elif isinstance(v, dict):
+            v = Grain.model_validate(v)
         if not v:
             raise SyntaxError(f"Invalid grain {v} for concept {values['name']}")
         return v
@@ -3337,7 +3342,7 @@ class EnvironmentConceptDict(dict):
 class ImportStatement(HasUUID, BaseModel):
     alias: str
     path: Path
-    environment: Union["Environment", None] = None
+    # environment: Union["Environment", None] = None
     # TODO: this might result in a lot of duplication
     # environment:"Environment"
 
@@ -3385,9 +3390,13 @@ class Environment(BaseModel):
     environment_config: EnvironmentOptions = Field(default_factory=EnvironmentOptions)
     version: str = Field(default_factory=get_version)
     cte_name_map: Dict[str, str] = Field(default_factory=dict)
-
-    materialized_concepts: List[Concept] = Field(default_factory=list)
+    materialized_concepts: set[str] = Field(default_factory=set)
     alias_origin_lookup: Dict[str, Concept] = Field(default_factory=dict)
+    # TODO: support freezing environments to avoid mutation
+    # frozen: bool = False
+
+    def duplicate(self):
+        return self.model_copy(deep=True)
 
     def __init__(self, **data):
         super().__init__(**data)
@@ -3405,6 +3414,12 @@ class Environment(BaseModel):
         )
         self.add_concept(concept)
 
+    # def freeze(self):
+    #     self.frozen = True
+
+    # def thaw(self):
+    #     self.frozen = False
+
     @classmethod
     def from_file(cls, path: str | Path) -> "Environment":
         with open(path, "r") as f:
@@ -3435,14 +3450,17 @@ class Environment(BaseModel):
         for datasource in self.datasources.values():
             for concept in datasource.output_concepts:
                 concrete_addresses.add(concept.address)
-        self.materialized_concepts = unique(
-            [c for c in self.concepts.values() if c.address in concrete_addresses]
+        self.materialized_concepts = set(
+            [
+                c.address
+                for c in self.concepts.values()
+                if c.address in concrete_addresses
+            ]
             + [
-                c
+                c.address
                 for c in self.alias_origin_lookup.values()
                 if c.address in concrete_addresses
             ],
-            "address",
         )
 
     def validate_concept(self, new_concept: Concept, meta: Meta | None = None):
@@ -3602,7 +3620,7 @@ class Environment(BaseModel):
                     f"Unable to import file {target.parent}, parsing error: {e}"
                 )
             env = nparser.environment
-        imps = ImportStatement(alias=alias, path=target, environment=env)
+        imps = ImportStatement(alias=alias, path=target)
         self.add_import(alias, source=env, imp_stm=imps)
         return imps
 

trilogy/core/processing/node_generators/select_node.py

@@ -34,7 +34,7 @@ def gen_select_node(
         concepts=[
             x
             for x in all_concepts
-            if x.address in [z for z in environment.materialized_concepts]
+            if x.address in environment.materialized_concepts
             or x.derivation == PurposeLineage.CONSTANT
         ]
     )

trilogy/core/processing/node_generators/window_node.py

@@ -10,7 +10,9 @@ from trilogy.core.processing.utility import padding
 LOGGER_PREFIX = "[GEN_WINDOW_NODE]"
 
 
-def resolve_window_parent_concepts(concept: Concept) -> tuple[Concept, List[Concept]]:
+def resolve_window_parent_concepts(
+    concept: Concept, environment: Environment
+) -> tuple[Concept, List[Concept]]:
     if not isinstance(concept.lineage, WindowItem):
         raise ValueError
     base = []
@@ -18,6 +20,11 @@ def resolve_window_parent_concepts(concept: Concept) -> tuple[Concept, List[Conc
         base += concept.lineage.over
     if concept.lineage.order_by:
         for item in concept.lineage.order_by:
+            # TODO: we do want to use the rehydrated value, but
+            # that introduces a circular dependency on an aggregate
+            # that is grouped by a window
+            # need to figure out how to resolve this
+            # base += [environment.concepts[item.expr.output.address]]
             base += [item.expr.output]
     return concept.lineage.content, unique(base, "address")
 
@@ -32,12 +39,12 @@ def gen_window_node(
     history: History | None = None,
     conditions: WhereClause | None = None,
 ) -> StrategyNode | None:
-    base, parent_concepts = resolve_window_parent_concepts(concept)
+    base, parent_concepts = resolve_window_parent_concepts(concept, environment)
     equivalent_optional = [
         x
         for x in local_optional
         if isinstance(x.lineage, WindowItem)
-        and resolve_window_parent_concepts(x)[1] == parent_concepts
+        and resolve_window_parent_concepts(x, environment)[1] == parent_concepts
     ]
 
     non_equivalent_optional = [

trilogy/dialect/base.py

@@ -348,12 +348,31 @@ class BaseDialect:
             ):
                 rval = f":{c.safe_address}"
             else:
-                args = [
-                    self.render_expr(
-                        v, cte=cte, raise_invalid=raise_invalid
-                    )  # , alias=False)
-                    for v in c.lineage.arguments
-                ]
+                args = []
+                for arg in c.lineage.arguments:
+                    if (
+                        isinstance(arg, Concept)
+                        and arg.lineage
+                        and isinstance(arg.lineage, Function)
+                        and arg.lineage.operator
+                        in (
+                            FunctionType.ADD,
+                            FunctionType.SUBTRACT,
+                            FunctionType.DIVIDE,
+                            FunctionType.MULTIPLY,
+                        )
+                    ):
+                        args.append(
+                            self.render_expr(
+                                Parenthetical(content=arg),
+                                cte=cte,
+                                raise_invalid=raise_invalid,
+                            )
+                        )
+                    else:
+                        args.append(
+                            self.render_expr(arg, cte=cte, raise_invalid=raise_invalid)
+                        )
 
                 if cte.group_to_grain:
                     rval = f"{self.FUNCTION_MAP[c.lineage.operator](args)}"
@@ -492,25 +511,39 @@ class BaseDialect:
         elif isinstance(e, CaseElse):
             return f"ELSE {self.render_expr(e.expr, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid) }"
         elif isinstance(e, Function):
-
-            if cte and cte.group_to_grain:
-                return self.FUNCTION_MAP[e.operator](
-                    [
+            arguments = []
+            for arg in e.arguments:
+                if (
+                    isinstance(arg, Concept)
+                    and arg.lineage
+                    and isinstance(arg.lineage, Function)
+                    and arg.lineage.operator
+                    in (
+                        FunctionType.ADD,
+                        FunctionType.SUBTRACT,
+                        FunctionType.DIVIDE,
+                        FunctionType.MULTIPLY,
+                    )
+                ):
+                    arguments.append(
                         self.render_expr(
-                            z, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid
+                            Parenthetical(content=arg),
+                            cte=cte,
+                            cte_map=cte_map,
+                            raise_invalid=raise_invalid,
                         )
-                        for z in e.arguments
-                    ]
-                )
-
-            return self.FUNCTION_GRAIN_MATCH_MAP[e.operator](
-                [
-                    self.render_expr(
-                        z, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid
                     )
-                    for z in e.arguments
-                ]
-            )
+                else:
+                    arguments.append(
+                        self.render_expr(
+                            arg, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid
+                        )
+                    )
+
+            if cte and cte.group_to_grain:
+                return self.FUNCTION_MAP[e.operator](arguments)
+
+            return self.FUNCTION_GRAIN_MATCH_MAP[e.operator](arguments)
         elif isinstance(e, AggregateWrapper):
             return self.render_expr(
                 e.function, cte, cte_map=cte_map, raise_invalid=raise_invalid

trilogy/parsing/common.py

@@ -13,6 +13,7 @@ from trilogy.core.models import (
     Parenthetical,
     FunctionClass,
     Environment,
+    DataType,
 )
 from typing import List, Tuple
 from trilogy.core.functions import (
@@ -25,7 +26,7 @@ from trilogy.core.enums import PurposeLineage
 from trilogy.constants import (
     VIRTUAL_CONCEPT_PREFIX,
 )
-from trilogy.core.enums import Modifier
+from trilogy.core.enums import Modifier, WindowType
 
 
 def get_upstream_modifiers(keys: List[Concept]) -> list[Modifier]:
@@ -234,9 +235,18 @@ def window_item_to_concept(
     else:
         grain = parent.over + [parent.content.output]
     modifiers = get_upstream_modifiers(parent.content.concept_arguments)
+    datatype = parent.content.datatype
+    if parent.type in (
+        WindowType.RANK,
+        WindowType.ROW_NUMBER,
+        WindowType.COUNT,
+        WindowType.COUNT_DISTINCT,
+    ):
+        datatype = DataType.INTEGER
+
     return Concept(
         name=name,
-        datatype=parent.content.datatype,
+        datatype=datatype,
         purpose=local_purpose,
         lineage=parent,
         metadata=fmetadata,

trilogy/parsing/parse_engine.py

@@ -907,9 +907,7 @@ class ParseToObjects(Transformer):
             except Exception as e:
                 raise ImportError(f"Unable to import file {target}, parsing error: {e}")
 
-        imps = ImportStatement(
-            alias=alias, path=Path(args[0]), environment=nparser.environment
-        )
+        imps = ImportStatement(alias=alias, path=Path(args[0]))
         self.environment.add_import(alias, nparser.environment, imps)
         return imps