pytrilogy 0.0.2.35__py3-none-any.whl → 0.0.2.37__py3-none-any.whl

{pytrilogy-0.0.2.35.dist-info → pytrilogy-0.0.2.37.dist-info}/METADATA

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

{pytrilogy-0.0.2.35.dist-info → pytrilogy-0.0.2.37.dist-info}/RECORD

@@ -1,8 +1,8 @@
-trilogy/__init__.py,sha256=U5WUYHe0fhxaKEzGbop_KX-WSQsCDldtJFhRs5Ojqys,291
+trilogy/__init__.py,sha256=Keq-D-sl-p9mpGadAtrLKltDPbZTIiu4FdY6d8qJ4kk,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/constants.py,sha256=HQAnGUqJ5uMri7TWtqXHhz8iVWBzi2LCfRG8vKnBIB8,1269
+trilogy/constants.py,sha256=UPymm94T2c6a55XdDaXw0aleTe1pOJ6lf6gOWLKZyKg,1430
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
-trilogy/executor.py,sha256=VcZ2U3RUU2al_VJ75AKVwmCJQLltYouxlgTjq4oxPB0,12577
+trilogy/executor.py,sha256=FXxtBOAFFPY20fsyoDeLHr7DWHHBxxCOnQwpSeyODzI,14757
 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=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=9jSrHBh8aE2BD4aoETm_QhRN3KI1mI009xKHTp8fLWE,162668
+trilogy/core/models.py,sha256=GMqdaZ7FgNYsoNDPKoSWt1Xxxk2SJYBNk2yPazhIHzQ,162855
 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
@@ -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=V3YSzuyom8PLRS5Qru4iGatlB0huNLKorPKsYoAVWLk,34308
+trilogy/dialect/base.py,sha256=wkK8NESHfko7bUavaMFvJHzaGNoHd3r03j-kfIyD4bY,34626
 trilogy/dialect/bigquery.py,sha256=15KJ-cOpBlk9O7FPviPgmg8xIydJeKx7WfmL3SSsPE8,2953
 trilogy/dialect/common.py,sha256=eqJi_Si1iyb2sV0siTf8g8JOHueWu6RkdtQZtutKazk,3826
 trilogy/dialect/config.py,sha256=tLVEMctaTDhUgARKXUNfHUcIolGaALkQ0RavUvXAY4w,2994
@@ -70,14 +70,14 @@ trilogy/parsing/common.py,sha256=_GW9LU6_4RuUgcdcr8EE1ybCRd-7cz3idZtjHZ66pYA,101
 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=ukdJ5QlWcWGkvb7kd3PnnOXEVpURHm0rap8QCvvjALg,63811
-trilogy/parsing/render.py,sha256=VKyo8wEOuiOzUtJ6w9EoGGmkhlqDQyy8wFj_Q_h6EfE,15263
-trilogy/parsing/trilogy.lark,sha256=Tuqw5oGMwOYt3TYOEx_hZqGpsAp-PiAKiMW8S3EFRcg,12236
+trilogy/parsing/parse_engine.py,sha256=9qmfqpibuIlTDrI_ywGAe2A_BgiRaU2zrec_BJaOu6k,63945
+trilogy/parsing/render.py,sha256=dhHkwmZ5HNNJr-z81JDpN2TBe4Ktqarus5vtMn2-_B8,15502
+trilogy/parsing/trilogy.lark,sha256=IZ-uSyTkjHtyqqYEH9fomM7yomCvP6AdH8wJSjPAuHc,12338
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.35.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.35.dist-info/METADATA,sha256=X18LM4yuJMZ4kh9Q6BUOWlxvEZgmRXMBCp9F3GNmQuA,8424
-pytrilogy-0.0.2.35.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-pytrilogy-0.0.2.35.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.35.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.35.dist-info/RECORD,,
+pytrilogy-0.0.2.37.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.37.dist-info/METADATA,sha256=7Metihqd20_keAEEW5_7V3iQDhCG61TCCKNG8hI-d1s,8424
+pytrilogy-0.0.2.37.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+pytrilogy-0.0.2.37.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.37.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.37.dist-info/RECORD,,

{pytrilogy-0.0.2.35.dist-info → pytrilogy-0.0.2.37.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.4.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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

trilogy/constants.py

@@ -39,6 +39,13 @@ class Comments:
     partial: bool = True
 
 
+@dataclass
+class Rendering:
+    """Control how the SQL is rendered"""
+
+    parameters: bool = True
+
+
 # TODO: support loading from environments
 @dataclass
 class Config:
@@ -48,6 +55,7 @@ class Config:
     validate_missing: bool = True
     comments: Comments = field(default_factory=Comments)
     optimizations: Optimizations = field(default_factory=Optimizations)
+    rendering: Rendering = field(default_factory=Rendering)
 
     @property
     def show_comments(self) -> bool:

trilogy/core/models.py

@@ -3276,7 +3276,7 @@ class EnvironmentConceptDict(dict):
             return default
 
     def __getitem__(
-        self, key, line_no: int | None = None
+        self, key, line_no: int | None = None, file: Path | None = None
     ) -> Concept | UndefinedConcept:
         try:
             return super(EnvironmentConceptDict, self).__getitem__(key)
@@ -3304,6 +3304,10 @@ class EnvironmentConceptDict(dict):
                 message += f" Suggestions: {matches}"
 
             if line_no:
+                if file:
+                    raise UndefinedConceptException(
+                        f"{file}: {line_no}: " + message, matches
+                    )
                 raise UndefinedConceptException(f"line: {line_no}: " + message, matches)
             raise UndefinedConceptException(message, matches)
 
@@ -3377,6 +3381,21 @@ class Environment(BaseModel):
     materialized_concepts: List[Concept] = Field(default_factory=list)
     alias_origin_lookup: Dict[str, Concept] = Field(default_factory=dict)
 
+    def __init__(self, **data):
+        super().__init__(**data)
+        self.concepts["_env_working_path"] = Concept(
+            name="_env_working_path",
+            namespace=self.namespace,
+            lineage=Function(
+                operator=FunctionType.CONSTANT,
+                arguments=[str(self.working_path)],
+                output_datatype=DataType.STRING,
+                output_purpose=Purpose.CONSTANT,
+            ),
+            datatype=DataType.STRING,
+            purpose=Purpose.CONSTANT,
+        )
+
     @classmethod
     def from_file(cls, path: str | Path) -> "Environment":
         with open(path, "r") as f:
@@ -3550,16 +3569,7 @@ class Environment(BaseModel):
             target = target.with_suffix(".preql")
         else:
             target = path
-        if alias in self.imports:
-            imports = self.imports[alias]
-            for x in imports:
-                if x.path == target:
-                    return imports
-        if env:
-            self.imports[alias].append(
-                ImportStatement(alias=alias, path=target, environment=env)
-            )
-        else:
+        if not env:
             parse_address = gen_cache_lookup(str(target), alias, str(self.working_path))
             try:
                 with open(target, "r", encoding="utf-8") as f:
@@ -3583,13 +3593,8 @@ class Environment(BaseModel):
                     f"Unable to import file {target.parent}, parsing error: {e}"
                 )
             env = nparser.environment
-        for _, concept in env.concepts.items():
-            self.add_concept(concept.with_namespace(alias))
-
-        for _, datasource in env.datasources.items():
-            self.add_datasource(datasource.with_namespace(alias))
         imps = ImportStatement(alias=alias, path=target, environment=env)
-        self.imports[alias].append(imps)
+        self.add_import(alias, source=env, imp_stm=imps)
         return imps
 
     def parse(

trilogy/dialect/base.py

@@ -337,6 +337,13 @@ class BaseDialect:
                         " target grain"
                     )
                     rval = f"{self.FUNCTION_GRAIN_MATCH_MAP[c.lineage.function.operator](args)}"
+            elif (
+                isinstance(c.lineage, Function)
+                and c.lineage.operator == FunctionType.CONSTANT
+                and CONFIG.rendering.parameters is True
+                and c.datatype.data_type != DataType.MAP
+            ):
+                rval = f":{c.safe_address}"
             else:
                 args = [
                     self.render_expr(
@@ -541,7 +548,7 @@ class BaseDialect:
         else:
             raise ValueError(f"Unable to render type {type(e)} {e}")
 
-    def render_cte(self, cte: CTE, auto_sort: bool = True):
+    def render_cte(self, cte: CTE, auto_sort: bool = True) -> CompiledCTE:
         if self.UNNEST_MODE in (
             UnnestMode.CROSS_APPLY,
             UnnestMode.CROSS_JOIN,

trilogy/executor.py

@@ -20,10 +20,16 @@ from trilogy.core.models import (
     ConceptDeclarationStatement,
     Datasource,
     CopyStatement,
+    ImportStatement,
+    MergeStatementV2,
+    Function,
+    FunctionType,
+    MapWrapper,
+    ListWrapper,
 )
 from trilogy.dialect.base import BaseDialect
 from trilogy.dialect.enums import Dialects
-from trilogy.core.enums import IOType
+from trilogy.core.enums import IOType, Granularity
 from trilogy.parser import parse_text
 from trilogy.hooks.base_hook import BaseHook
 from pathlib import Path
@@ -104,6 +110,7 @@ class Executor(object):
                 ProcessedShowStatement,
                 ProcessedQueryPersist,
                 ProcessedCopyStatement,
+                ProcessedRawSQLStatement,
             ),
         ):
             return None
@@ -142,7 +149,6 @@ class Executor(object):
 
     @execute_query.register
     def _(self, query: str) -> CursorResult:
-
         return self.execute_text(query)[-1]
 
     @execute_query.register
@@ -181,6 +187,34 @@ class Executor(object):
             ],
         )
 
+    @execute_query.register
+    def _(self, query: ImportStatement) -> CursorResult:
+        return MockResult(
+            [
+                {
+                    "path": query.path,
+                    "alias": query.alias,
+                }
+            ],
+            ["path", "alias"],
+        )
+
+    @execute_query.register
+    def _(self, query: MergeStatementV2) -> CursorResult:
+
+        self.environment.merge_concept(
+            query.source, query.target, modifiers=query.modifiers
+        )
+        return MockResult(
+            [
+                {
+                    "source": query.source.address,
+                    "target": query.target.address,
+                }
+            ],
+            ["source", "target"],
+        )
+
     @execute_query.register
     def _(self, query: ProcessedRawSQLStatement) -> CursorResult:
         return self.execute_raw_sql(query.text)
@@ -188,8 +222,7 @@ class Executor(object):
     @execute_query.register
     def _(self, query: ProcessedQuery) -> CursorResult:
         sql = self.generator.compile_statement(query)
-        # connection = self.engine.connect()
-        output = self.connection.execute(text(sql))
+        output = self.execute_raw_sql(sql)
         return output
 
     @execute_query.register
@@ -197,14 +230,14 @@ class Executor(object):
 
         sql = self.generator.compile_statement(query)
 
-        output = self.connection.execute(text(sql))
+        output = self.execute_raw_sql(sql)
         self.environment.add_datasource(query.datasource)
         return output
 
     @execute_query.register
     def _(self, query: ProcessedCopyStatement) -> CursorResult:
         sql = self.generator.compile_statement(query)
-        output: CursorResult = self.connection.execute(text(sql))
+        output: CursorResult = self.execute_raw_sql(sql)
         if query.target_type == IOType.CSV:
             import csv
 
@@ -213,7 +246,7 @@ class Executor(object):
                 outcsv.writerow(output.keys())
                 outcsv.writerows(output)
         else:
-            raise NotImplementedError(f"Unsupported IOType {query.target_type}")
+            raise NotImplementedError(f"Unsupported IO Type {query.target_type}")
         # now return the query we ran through IO
         # TODO: instead return how many rows were written?
         return generate_result_set(
@@ -339,13 +372,50 @@ class Executor(object):
             if persist and isinstance(x, ProcessedQueryPersist):
                 self.environment.add_datasource(x.datasource)
 
+    def _hydrate_param(self, param: str) -> Any:
+        matched = [
+            v
+            for v in self.environment.concepts.values()
+            if v.safe_address == param or v.address == param
+        ]
+        if not matched:
+            raise SyntaxError(f"No concept found for parameter {param}")
+
+        concept: Concept = matched.pop()
+        if not concept.granularity == Granularity.SINGLE_ROW:
+            raise SyntaxError(f"Cannot bind non-singleton concept {concept.address}")
+        if (
+            isinstance(concept.lineage, Function)
+            and concept.lineage.operator == FunctionType.CONSTANT
+        ):
+            rval = concept.lineage.arguments[0]
+            if isinstance(rval, ListWrapper):
+                return [x for x in rval]
+            if isinstance(rval, MapWrapper):
+                return {k: v for k, v in rval.items()}
+            return rval
+        else:
+            results = self.execute_query(f"select {concept.name} limit 1;").fetchone()
+        if not results:
+            return None
+        return results[0]
+
     def execute_raw_sql(
         self, command: str, variables: dict | None = None
     ) -> CursorResult:
         """Run a command against the raw underlying
         execution engine"""
+        final_params = None
+        q = text(command)
         if variables:
-            return self.connection.execute(text(command), variables)
+            final_params = variables
+        else:
+            params = q.compile().params
+            if params:
+                final_params = {x: self._hydrate_param(x) for x in params}
+
+        if final_params:
+            return self.connection.execute(text(command), final_params)
         return self.connection.execute(
             text(command),
         )

trilogy/parsing/parse_engine.py

@@ -302,6 +302,9 @@ class ParseToObjects(Transformer):
     def IDENTIFIER(self, args) -> str:
         return args.value
 
+    def QUOTED_IDENTIFIER(self, args) -> str:
+        return args.value[1:-1]
+
     @v_args(meta=True)
     def concept_lit(self, meta: Meta, args) -> Concept:
         return self.environment.concepts.__getitem__(args[0], meta.line)
@@ -386,7 +389,7 @@ class ParseToObjects(Transformer):
             modifiers += concept_list[:-1]
         concept = concept_list[-1]
         resolved = self.environment.concepts.__getitem__(  # type: ignore
-            key=concept, line_no=meta.line
+            key=concept, line_no=meta.line, file=self.token_address
         )
         return ColumnAssignment(alias=alias, modifiers=modifiers, concept=resolved)
 
@@ -801,7 +804,8 @@ class ParseToObjects(Transformer):
 
     @v_args(meta=True)
     def rawsql_statement(self, meta: Meta, args) -> RawSQLStatement:
-        return RawSQLStatement(meta=Metadata(line_number=meta.line), text=args[0])
+        statement = RawSQLStatement(meta=Metadata(line_number=meta.line), text=args[0])
+        return statement
 
     def COPY_TYPE(self, args) -> IOType:
         return IOType(args.value)

trilogy/parsing/render.py

@@ -368,9 +368,15 @@ class Renderer:
 
     @to_string.register
     def _(self, arg: "ImportStatement"):
-        if arg.alias == DEFAULT_NAMESPACE:
-            return f"import {arg.path};"
-        return f"import {arg.path} as {arg.alias};"
+        path: str = str(arg.path).replace("\\", ".")
+        path = path.replace("/", ".")
+        if path.endswith(".preql"):
+            path = path.rsplit(".", 1)[0]
+        if path.startswith("."):
+            path = path[1:]
+        if arg.alias == DEFAULT_NAMESPACE or not arg.alias:
+            return f"import {path};"
+        return f"import {path} as {arg.alias};"
 
     @to_string.register
     def _(self, arg: "Concept"):

trilogy/parsing/trilogy.lark

@@ -49,7 +49,7 @@
     
     //column_assignment
     //figure out if we want static
-    column_assignment: (raw_column_assignment | IDENTIFIER |  _static_functions  ) ":" concept_assignment
+    column_assignment: (raw_column_assignment | IDENTIFIER | QUOTED_IDENTIFIER |  _static_functions  ) ":" concept_assignment
     
     RAW_ENTRY.1: /raw\s*\(/s
 
@@ -292,6 +292,7 @@
     // base language constructs
     concept_lit: IDENTIFIER
     IDENTIFIER: /[a-zA-Z\_][a-zA-Z0-9\_\-\.]*/
+    QUOTED_IDENTIFIER:  /`[a-zA-Z\_][a-zA-Z0-9\_\.\-\*\:\s]*`/
     QUOTED_ADDRESS:  /`[a-zA-Z\_][a-zA-Z0-9\_\.\-\*\:]*`/
     ADDRESS: IDENTIFIER
 
@@ -301,7 +302,7 @@
     SINGLE_STRING_CHARS: /(?:(?!\${)([^'\\]|\\.))+/+ // any character except '
     _single_quote: "'" ( SINGLE_STRING_CHARS )* "'" 
     _double_quote: "\"" ( DOUBLE_STRING_CHARS )* "\"" 
-    string_lit: _single_quote | _double_quote
+    string_lit: _single_quote | _double_quote | MULTILINE_STRING
 
     MINUS: "-"