pytrilogy 0.0.2.34__py3-none-any.whl → 0.0.2.36__py3-none-any.whl

{pytrilogy-0.0.2.34.dist-info → pytrilogy-0.0.2.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.34
+Version: 0.0.2.36
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -20,6 +20,7 @@ Requires-Dist: networkx
 Requires-Dist: pyodbc
 Requires-Dist: pydantic
 Requires-Dist: duckdb-engine
+Requires-Dist: click
 Provides-Extra: bigquery
 Requires-Dist: sqlalchemy-bigquery; extra == "bigquery"
 Provides-Extra: postgres

{pytrilogy-0.0.2.34.dist-info → pytrilogy-0.0.2.36.dist-info}/RECORD

@@ -1,14 +1,14 @@
-trilogy/__init__.py,sha256=KM64JjCIbIm0t7no7TfLDsHkXU-HC5d2by7YePMKmq8,291
+trilogy/__init__.py,sha256=nmEtedZ0VhRnMAaMT0xsUW46MvwSivUw-Vq9Y6h2M70,291
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=HQAnGUqJ5uMri7TWtqXHhz8iVWBzi2LCfRG8vKnBIB8,1269
 trilogy/engine.py,sha256=R5ubIxYyrxRExz07aZCUfrTsoXCHQ8DKFTDsobXdWdA,1102
-trilogy/executor.py,sha256=VcZ2U3RUU2al_VJ75AKVwmCJQLltYouxlgTjq4oxPB0,12577
+trilogy/executor.py,sha256=0b0iEd660aR3_rJlHp73azRu5iQK6si5qEszoSwz8FU,13472
 trilogy/parser.py,sha256=UtuqSiGiCjpMAYgo1bvNq-b7NSzCA5hzbUW31RXaMII,281
 trilogy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/utility.py,sha256=zM__8r29EsyDW7K9VOHz8yvZC2bXFzh7xKy3cL7GKsk,707
 trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
-trilogy/core/enums.py,sha256=GG51K-bP3HTVuvJQFCjbmVt7iBOGpmF_qtnRVf0_obI,6396
+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
@@ -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=xZHi9IYo_vSG35rF4fp7bLrGIu8J5QXqDObpZgN0_cI,160541
+trilogy/core/models.py,sha256=iP1ioJmKDS1_43TE0mIGWZGDtFPD3m8kKvXYA9lwCkg,162860
 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
@@ -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=mMMP0TPLAHx0m4c7scXxosDIgfPYyUYmlgwAFtVeRe0,66699
-trilogy/parsing/render.py,sha256=VKyo8wEOuiOzUtJ6w9EoGGmkhlqDQyy8wFj_Q_h6EfE,15263
-trilogy/parsing/trilogy.lark,sha256=Tuqw5oGMwOYt3TYOEx_hZqGpsAp-PiAKiMW8S3EFRcg,12236
+trilogy/parsing/parse_engine.py,sha256=Mv2GrE-7IteyK67wZBPm0iEXY2Wbnb4CPNNSD3kXn-E,63915
+trilogy/parsing/render.py,sha256=dhHkwmZ5HNNJr-z81JDpN2TBe4Ktqarus5vtMn2-_B8,15502
+trilogy/parsing/trilogy.lark,sha256=o3gZiqPE3FNEJjJZDeSZ-ETD3HUQDIFZaYWrVDmxSB4,12319
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=PHxvv6f2ODv0esyyhWxlARgra8dVhqQhYl0lTrSyVNo,3729
-pytrilogy-0.0.2.34.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.2.34.dist-info/METADATA,sha256=jvasI3x4y_xwYh4TToePk_EQIwEr0Kfw2zqESs65bQk,8403
-pytrilogy-0.0.2.34.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-pytrilogy-0.0.2.34.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.2.34.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.2.34.dist-info/RECORD,,
+pytrilogy-0.0.2.36.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.2.36.dist-info/METADATA,sha256=Zl-ztc3tMnv-LbxCvmAItYOrmJ-p1pIDYW0uOmRFwYI,8424
+pytrilogy-0.0.2.36.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+pytrilogy-0.0.2.36.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.2.36.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.2.36.dist-info/RECORD,,

{pytrilogy-0.0.2.34.dist-info → pytrilogy-0.0.2.36.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.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.34"
+__version__ = "0.0.2.36"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/enums.py

@@ -215,11 +215,28 @@ class Boolean(Enum):
     TRUE = "true"
     FALSE = "false"
 
+    @classmethod
+    def _missing_(cls, value):
+        if value is True:
+            return Boolean.TRUE
+        elif value is False:
+            return Boolean.FALSE
+        strval = str(value)
+        if strval.lower() != strval:
+            return Boolean(strval.lower())
+
 
 class BooleanOperator(Enum):
     AND = "and"
     OR = "or"
 
+    @classmethod
+    def _missing_(cls, value):
+        strval = str(value)
+        if strval.lower() != strval:
+            return BooleanOperator(strval.lower())
+        return None
+
 
 class ComparisonOperator(Enum):
     LT = "<"

trilogy/core/models.py

@@ -1629,6 +1629,45 @@ class SelectStatement(HasUUID, Mergeable, Namespaced, SelectTypeMixin, BaseModel
                     self.grain
                 )
 
+    def validate_syntax(self):
+        all_in_output = [x.address for x in self.output_components]
+        if self.where_clause:
+            for concept in self.where_clause.concept_arguments:
+
+                if (
+                    concept.lineage
+                    and isinstance(concept.lineage, Function)
+                    and concept.lineage.operator
+                    in FunctionClass.AGGREGATE_FUNCTIONS.value
+                ):
+                    if concept.address in self.locally_derived:
+                        raise SyntaxError(
+                            f"Cannot reference an aggregate derived in the select ({concept.address}) in the same statement where clause; move to the HAVING clause instead; Line: {self.meta.line_number}"
+                        )
+
+                if (
+                    concept.lineage
+                    and isinstance(concept.lineage, AggregateWrapper)
+                    and concept.lineage.function.operator
+                    in FunctionClass.AGGREGATE_FUNCTIONS.value
+                ):
+                    if concept.address in self.locally_derived:
+                        raise SyntaxError(
+                            f"Cannot reference an aggregate derived in the select ({concept.address}) in the same statement where clause; move to the HAVING clause instead; Line: {self.meta.line_number}"
+                        )
+        if self.having_clause:
+            for concept in self.having_clause.concept_arguments:
+                if concept.address not in [x.address for x in self.output_components]:
+                    raise SyntaxError(
+                        f"Cannot reference a column ({concept.address}) that is not in the select projection in the HAVING clause, move to WHERE;  Line: {self.meta.line_number}"
+                    )
+        if self.order_by:
+            for concept in self.order_by.concept_arguments:
+                if concept.address not in all_in_output:
+                    raise SyntaxError(
+                        f"Cannot order by a column that is not in the output projection; {self.meta.line_number}"
+                    )
+
     def __str__(self):
         from trilogy.parsing.render import render_query
 
@@ -3237,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)
@@ -3265,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)
 

trilogy/executor.py

@@ -20,6 +20,8 @@ from trilogy.core.models import (
     ConceptDeclarationStatement,
     Datasource,
     CopyStatement,
+    ImportStatement,
+    MergeStatementV2,
 )
 from trilogy.dialect.base import BaseDialect
 from trilogy.dialect.enums import Dialects
@@ -104,6 +106,7 @@ class Executor(object):
                 ProcessedShowStatement,
                 ProcessedQueryPersist,
                 ProcessedCopyStatement,
+                ProcessedRawSQLStatement,
             ),
         ):
             return None
@@ -142,7 +145,6 @@ class Executor(object):
 
     @execute_query.register
     def _(self, query: str) -> CursorResult:
-
         return self.execute_text(query)[-1]
 
     @execute_query.register
@@ -181,6 +183,35 @@ class Executor(object):
             ],
         )
 
+    @execute_query.register
+    def _(self, query: ImportStatement) -> CursorResult:
+        self.environment.add_file_import(query.path, query.alias)
+        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)

trilogy/parsing/parse_engine.py

@@ -30,7 +30,6 @@ from trilogy.core.enums import (
     WindowType,
     DatePart,
     ShowCategory,
-    FunctionClass,
     IOType,
     ConceptSource,
 )
@@ -264,7 +263,6 @@ class ParseToObjects(Transformer):
         for k, v in self.parsed.items():
             if v.pass_count == 2:
                 continue
-            print(f"Hydrating {k}")
             v.hydrate_missing()
         self.environment.concepts.fail_on_missing = True
         reparsed = self.transform(self.tokens[self.token_address])
@@ -304,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)
@@ -388,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)
 
@@ -988,8 +989,6 @@ class ParseToObjects(Transformer):
             order_by=order_by,
             meta=Metadata(line_number=meta.line),
         )
-        locally_derived: set[str] = set()
-        all_in_output: set[str] = set()
         for item in select_items:
             # we don't know the grain of an aggregate at assignment time
             # so rebuild at this point in the tree
@@ -998,25 +997,16 @@ class ParseToObjects(Transformer):
                 new_concept = item.content.output.with_select_context(
                     output.grain,
                     conditional=None,
-                    # conditional=(
-                    #     output.where_clause.conditional
-                    #     if output.where_clause
-                    #     and output.where_clause_category == SelectFiltering.IMPLICIT
-                    #     else None
-                    # ),
                     environment=self.environment,
                 )
                 self.environment.add_concept(new_concept, meta=meta)
                 item.content.output = new_concept
-                locally_derived.add(new_concept.address)
-                all_in_output.add(new_concept.address)
             elif isinstance(item.content, Concept):
                 # Sometimes cached values here don't have the latest info
                 # but we can't just use environment, as it might not have the right grain.
                 item.content = self.environment.concepts[
                     item.content.address
                 ].with_grain(item.content.grain)
-                all_in_output.add(item.content.address)
         if order_by:
             for orderitem in order_by.items:
                 if isinstance(orderitem.expr, Concept):
@@ -1024,52 +1014,9 @@ class ParseToObjects(Transformer):
                         orderitem.expr = orderitem.expr.with_select_context(
                             output.grain,
                             conditional=None,
-                            # conditional=(
-                            #     output.where_clause.conditional
-                            #     if output.where_clause
-                            #     and output.where_clause_category
-                            #     == SelectFiltering.IMPLICIT
-                            #     else None
-                            # ),
                             environment=self.environment,
                         )
-        if output.where_clause:
-            for concept in output.where_clause.concept_arguments:
-
-                if (
-                    concept.lineage
-                    and isinstance(concept.lineage, Function)
-                    and concept.lineage.operator
-                    in FunctionClass.AGGREGATE_FUNCTIONS.value
-                ):
-                    if concept.address in locally_derived:
-                        raise SyntaxError(
-                            f"Cannot reference an aggregate derived in the select ({concept.address}) in the same statement where clause; move to the HAVING clause instead; Line: {meta.line}"
-                        )
-
-                if (
-                    concept.lineage
-                    and isinstance(concept.lineage, AggregateWrapper)
-                    and concept.lineage.function.operator
-                    in FunctionClass.AGGREGATE_FUNCTIONS.value
-                ):
-                    if concept.address in locally_derived:
-                        raise SyntaxError(
-                            f"Cannot reference an aggregate derived in the select ({concept.address}) in the same statement where clause; move to the HAVING clause instead; Line: {meta.line}"
-                        )
-        if output.having_clause:
-            for concept in output.having_clause.concept_arguments:
-                if concept.address not in all_in_output:
-                    raise SyntaxError(
-                        f"Cannot reference a column ({concept.address}) that is not in the select projection in the HAVING clause, move to WHERE;  Line: {meta.line}"
-                    )
-        if output.order_by:
-            for concept in output.order_by.concept_arguments:
-                if concept.address not in all_in_output:
-                    raise SyntaxError(
-                        f"Cannot order by a column that is not in the output projection; {meta.line}"
-                    )
-
+        output.validate_syntax()
         return output
 
     @v_args(meta=True)

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