pytrilogy 0.0.3.75__tar.gz → 0.0.3.77__tar.gz

{pytrilogy-0.0.3.75/pytrilogy.egg-info → pytrilogy-0.0.3.77}/PKG-INFO

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

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/tests/test_parse_engine.py

@@ -3,6 +3,7 @@ from pytest import raises
 from trilogy.core.exceptions import UndefinedConceptException
 from trilogy.core.models.environment import Environment
 from trilogy.parsing.parse_engine import (
+    ERROR_CODES,
     PARSER,
     InvalidSyntaxException,
     ParseToObjects,
@@ -66,18 +67,45 @@ address fun;
     x.run_second_parse_pass()
 
 
-TEXT2 = """
+def test_from_error():
+    env = Environment()
+    TEXT2 = """
+    const a <- 1;
+
+    select
+        a,
+    FROM a
+    ;
+    """
+    with raises(InvalidSyntaxException) as e:
+        env.parse(TEXT2)
+    assert ERROR_CODES[101] in str(e.value), e.value
+
+
+def test_error_order_by_missing():
+    env = Environment()
+    TEXT2 = """
 const a <- 1;
 
 select
     a,
-FROM a
+order by a
 ;
-"""
+    """
+    with raises(InvalidSyntaxException) as e:
+        env.parse(TEXT2)
+    assert ERROR_CODES[210] in str(e.value)
 
 
-def test_from_error():
+def test_alias_error():
     env = Environment()
-
-    with raises(InvalidSyntaxException):
+    TEXT2 = """
+    const a <- 1;
+
+    select
+        a+2 fun,
+    ;
+    """
+    with raises(InvalidSyntaxException) as e:
         env.parse(TEXT2)
+    assert ERROR_CODES[201] in str(e.value), e.value

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/tests/test_parsing.py

@@ -2,7 +2,13 @@ from trilogy import Dialects
 from trilogy.constants import MagicConstants
 from trilogy.core.enums import BooleanOperator, ComparisonOperator, Purpose
 from trilogy.core.functions import argument_to_purpose, function_args_to_output_purpose
-from trilogy.core.models.author import Comparison, Conditional, SubselectComparison
+from trilogy.core.models.author import (
+    Comparison,
+    Conditional,
+    ListWrapper,
+    SubselectComparison,
+)
+from trilogy.core.models.build import BuildComparison
 from trilogy.core.models.core import (
     DataType,
     TupleWrapper,
@@ -63,6 +69,35 @@ def test_not_in():
     assert rendered.strip() == "(1,2,3)".strip()
 
 
+def test_datetime_lit_rendering():
+    env, parsed = parse_text("const order_id <- 4;")
+
+    from datetime import datetime
+
+    now = datetime.now()
+    wrapper = ListWrapper(
+        (now,),
+        type=DataType.DATETIME,
+    )
+    assert wrapper[0] == now, wrapper
+    rendered = BaseDialect().render_expr(
+        BuildComparison(
+            left=env.materialize_for_select().concepts["order_id"],
+            operator=ComparisonOperator.NOT_IN,
+            right=wrapper,
+        )
+    )
+    assert "not in (date '" in rendered, rendered
+    rendered = BaseDialect().render_expr(
+        BuildComparison(
+            left=env.materialize_for_select().concepts["order_id"],
+            operator=ComparisonOperator.IN,
+            right=wrapper,
+        )
+    )
+    assert "in (date '" in rendered, rendered
+
+
 def test_is_not_null():
     _, parsed = parse_text(
         "const order_id <- 4; SELECT order_id  WHERE order_id is not null;"

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/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.75"
+__version__ = "0.0.3.77"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/trilogy/core/enums.py

@@ -353,7 +353,7 @@ class SourceType(Enum):
 
 
 class ShowCategory(Enum):
-    MODELS = "models"
+    DATASOURCES = "datasources"
     CONCEPTS = "concepts"
 
 

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/trilogy/core/internal.py

@@ -19,8 +19,26 @@ DEFAULT_CONCEPTS = {
         granularity=Granularity.SINGLE_ROW,
         derivation=Derivation.CONSTANT,
     ),
-    "concept_name": Concept(
-        name="concept_name",
+    "concept_address": Concept(
+        name="concept_address",
+        namespace=INTERNAL_NAMESPACE,
+        datatype=DataType.STRING,
+        purpose=Purpose.KEY,
+        grain=Grain(),
+        granularity=Granularity.SINGLE_ROW,
+        derivation=Derivation.CONSTANT,
+    ),
+    "concept_datatype": Concept(
+        name="concept_datatype",
+        namespace=INTERNAL_NAMESPACE,
+        datatype=DataType.STRING,
+        purpose=Purpose.KEY,
+        grain=Grain(),
+        granularity=Granularity.SINGLE_ROW,
+        derivation=Derivation.CONSTANT,
+    ),
+    "concept_description": Concept(
+        name="concept_description",
         namespace=INTERNAL_NAMESPACE,
         datatype=DataType.STRING,
         purpose=Purpose.KEY,

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/trilogy/core/models/author.py

@@ -77,7 +77,7 @@ class Mergeable(ABC):
     def with_merge(self, source: Concept, target: Concept, modifiers: List[Modifier]):
         raise NotImplementedError
 
-    def with_reference_replacement(self, source: str, target: Expr):
+    def with_reference_replacement(self, source: str, target: Expr | ArgBinding):
         raise NotImplementedError(type(self))
 
 
@@ -161,7 +161,7 @@ class ConceptRef(Addressable, Namespaced, DataTyped, Mergeable, BaseModel):
             metadata=self.metadata,
         )
 
-    def with_reference_replacement(self, source: str, target: Expr):
+    def with_reference_replacement(self, source: str, target: Expr | ArgBinding):
         if self.address == source:
             return target
         return self
@@ -1708,7 +1708,7 @@ class Function(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
                     )
         return v
 
-    def with_reference_replacement(self, source: str, target: Expr):
+    def with_reference_replacement(self, source: str, target: Expr | ArgBinding):
         from trilogy.core.functions import arg_to_datatype, merge_datatypes
 
         nargs = [
@@ -2303,13 +2303,13 @@ class CustomFunctionFactory:
         ]
         return self
 
-    def __call__(self, *creation_args: Expr):
+    def __call__(self, *creation_args: ArgBinding | Expr):
         nout = (
             self.function.model_copy(deep=True)
             if isinstance(self.function, BaseModel)
             else self.function
         )
-        creation_arg_list: list[Expr] = list(creation_args)
+        creation_arg_list: list[ArgBinding | Expr] = list(creation_args)
         if len(creation_args) < len(self.function_arguments):
             for binding in self.function_arguments[len(creation_arg_list) :]:
                 if binding.default is None:
@@ -2361,7 +2361,9 @@ class Comment(BaseModel):
 class ArgBinding(Namespaced, DataTyped, BaseModel):
     name: str
     default: Expr | None = None
-    datatype: DataType = DataType.UNKNOWN
+    datatype: (
+        DataType | MapType | ArrayType | NumericType | StructType | TraitDataType
+    ) = DataType.UNKNOWN
 
     def with_namespace(self, namespace):
         return ArgBinding(

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/trilogy/core/models/build.py

@@ -606,7 +606,6 @@ class BuildComparison(BuildConceptArgs, ConstantInlineable, BaseModel):
         int,
         str,
         float,
-        list,
         bool,
         datetime,
         date,
@@ -619,12 +618,13 @@ class BuildComparison(BuildConceptArgs, ConstantInlineable, BaseModel):
         MagicConstants,
         BuildWindowItem,
         BuildAggregateWrapper,
+        ListWrapper,
+        TupleWrapper,
     ]
     right: Union[
         int,
         str,
         float,
-        list,
         bool,
         date,
         datetime,
@@ -638,6 +638,7 @@ class BuildComparison(BuildConceptArgs, ConstantInlineable, BaseModel):
         BuildWindowItem,
         BuildAggregateWrapper,
         TupleWrapper,
+        ListWrapper,
     ]
     operator: ComparisonOperator
 
@@ -734,7 +735,6 @@ class BuildSubselectComparison(BuildComparison):
         int,
         str,
         float,
-        list,
         bool,
         datetime,
         date,
@@ -747,12 +747,13 @@ class BuildSubselectComparison(BuildComparison):
         MagicConstants,
         BuildWindowItem,
         BuildAggregateWrapper,
+        ListWrapper,
+        TupleWrapper,
     ]
     right: Union[
         int,
         str,
         float,
-        list,
         bool,
         date,
         datetime,
@@ -766,6 +767,7 @@ class BuildSubselectComparison(BuildComparison):
         BuildWindowItem,
         BuildAggregateWrapper,
         TupleWrapper,
+        ListWrapper,
     ]
     operator: ComparisonOperator
 

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/trilogy/core/statements/execute.py

@@ -38,6 +38,12 @@ class ProcessedRawSQLStatement(BaseModel):
     text: str
 
 
+class ProcessedStaticValueOutput(BaseModel):
+    values: List[dict]
+
+
 class ProcessedShowStatement(BaseModel):
     output_columns: List[ConceptRef]
-    output_values: List[Union[BuildConcept, BuildDatasource, ProcessedQuery]]
+    output_values: List[
+        Union[BuildConcept, BuildDatasource, ProcessedQuery, ProcessedStaticValueOutput]
+    ]

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/trilogy/dialect/base.py

@@ -16,6 +16,7 @@ from trilogy.core.enums import (
     DatePart,
     FunctionType,
     Ordering,
+    ShowCategory,
     UnnestMode,
     WindowType,
 )
@@ -77,6 +78,7 @@ from trilogy.core.statements.execute import (
     ProcessedQueryPersist,
     ProcessedRawSQLStatement,
     ProcessedShowStatement,
+    ProcessedStaticValueOutput,
 )
 from trilogy.core.utility import safe_quote
 from trilogy.dialect.common import render_join, render_unnest
@@ -638,18 +640,7 @@ class BaseDialect:
             ):
                 return f"{self.render_expr(e.left, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid)} {e.operator.value} {self.render_expr(e.right, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid)}"
 
-            elif isinstance(
-                e.right,
-                (
-                    str,
-                    int,
-                    bool,
-                    float,
-                ),
-            ):
-                return f"{self.render_expr(e.left, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid)} {e.operator.value} ({self.render_expr(e.right, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid)})"
-            else:
-                return f"{self.render_expr(e.left, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid)} {e.operator.value} {self.render_expr(e.right, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid)}"
+            return f"{self.render_expr(e.left, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid)} {e.operator.value} ({self.render_expr(e.right, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid)})"
         elif isinstance(e, COMPARISON_ITEMS):
             return f"{self.render_expr(e.left, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid)} {e.operator.value} {self.render_expr(e.right, cte=cte, cte_map=cte_map, raise_invalid=raise_invalid)}"
         elif isinstance(e, CONDITIONAL_ITEMS):
@@ -953,6 +944,46 @@ class BaseDialect:
             self.render_cte(sort_select_output(query.ctes[-1], query), auto_sort=False)
         ]
 
+    def create_show_output(
+        self,
+        environment: Environment,
+        content: ShowCategory,
+    ):
+        if content == ShowCategory.CONCEPTS:
+            output_columns = [
+                environment.concepts[
+                    DEFAULT_CONCEPTS["concept_address"].address
+                ].reference,
+                environment.concepts[
+                    DEFAULT_CONCEPTS["concept_datatype"].address
+                ].reference,
+                environment.concepts[
+                    DEFAULT_CONCEPTS["concept_description"].address
+                ].reference,
+            ]
+            output_values = [
+                {
+                    DEFAULT_CONCEPTS["concept_address"].address: (
+                        concept.name
+                        if concept.namespace == DEFAULT_NAMESPACE
+                        else concept.address
+                    ),
+                    DEFAULT_CONCEPTS["concept_datatype"].address: str(concept.datatype),
+                    DEFAULT_CONCEPTS[
+                        "concept_description"
+                    ].address: concept.metadata.description
+                    or "",
+                }
+                for _, concept in environment.concepts.items()
+                if not concept.is_internal
+            ]
+        else:
+            raise NotImplementedError(f"Show category {content} not implemented")
+        return ProcessedShowStatement(
+            output_columns=output_columns,
+            output_values=[ProcessedStaticValueOutput(values=output_values)],
+        )
+
     def generate_queries(
         self,
         environment: Environment,
@@ -1027,8 +1058,12 @@ class BaseDialect:
                             ],
                         )
                     )
+                elif isinstance(statement.content, ShowCategory):
+                    output.append(
+                        self.create_show_output(environment, statement.content)
+                    )
                 else:
-                    raise NotImplementedError(type(statement))
+                    raise NotImplementedError(type(statement.content))
             elif isinstance(statement, RawSQLStatement):
                 output.append(ProcessedRawSQLStatement(text=statement.text))
             elif isinstance(

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/trilogy/executor.py

@@ -30,6 +30,7 @@ from trilogy.core.statements.execute import (
     ProcessedQueryPersist,
     ProcessedRawSQLStatement,
     ProcessedShowStatement,
+    ProcessedStaticValueOutput,
 )
 from trilogy.dialect.base import BaseDialect
 from trilogy.dialect.enums import Dialects
@@ -470,16 +471,18 @@ class Executor(object):
         # connection = self.engine.connect()
         for statement in self.parse_text_generator(command):
             if isinstance(statement, ProcessedShowStatement):
-                output.append(
-                    generate_result_set(
-                        statement.output_columns,
-                        [
-                            self.generator.compile_statement(x)
-                            for x in statement.output_values
-                            if isinstance(x, ProcessedQuery)
-                        ],
-                    )
-                )
+                for x in statement.output_values:
+                    if isinstance(x, ProcessedStaticValueOutput):
+                        output.append(
+                            generate_result_set(statement.output_columns, x.values)
+                        )
+                    elif isinstance(x, ProcessedQuery):
+                        output.append(
+                            generate_result_set(
+                                statement.output_columns,
+                                [self.generator.compile_statement(x)],
+                            )
+                        )
                 continue
             if non_interactive:
                 if not isinstance(

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/trilogy/parsing/parse_engine.py

@@ -7,7 +7,7 @@ from pathlib import Path
 from re import IGNORECASE
 from typing import Any, List, Optional, Tuple, Union
 
-from lark import Lark, ParseTree, Transformer, Tree, v_args
+from lark import Lark, ParseTree, Token, Transformer, Tree, v_args
 from lark.exceptions import (
     UnexpectedCharacters,
     UnexpectedEOF,
@@ -2034,12 +2034,17 @@ class ParseToObjects(Transformer):
         return self.environment.functions[args[0]]
 
     @v_args(meta=True)
-    def farray_transform(self, meta, args):
+    def farray_transform(self, meta, args) -> Function:
         factory: CustomFunctionFactory = args[1]
         if not len(factory.function_arguments) == 1:
             raise InvalidSyntaxException(
                 "Array transform function must have exactly one argument;"
             )
+        array_type = arg_to_datatype(args[0])
+        if not isinstance(array_type, ArrayType):
+            raise InvalidSyntaxException(
+                f"Array transform function must be applied to an array, not {array_type}"
+            )
         return self.function_factory.create_function(
             [
                 args[0],
@@ -2047,7 +2052,7 @@ class ParseToObjects(Transformer):
                 factory(
                     ArgBinding(
                         name=factory.function_arguments[0].name,
-                        datatype=arg_to_datatype(args[0]).value_data_type,
+                        datatype=array_type.value_data_type,
                     )
                 ),
             ],
@@ -2086,6 +2091,15 @@ def parse_text_raw(text: str, environment: Optional[Environment] = None):
     PARSER.parse(text)
 
 
+ERROR_CODES: dict[int, str] = {
+    # 100 code are SQL compatability errors
+    101: "Trilogy does not have a FROM clause (Datasource resolution is automatic). Remove the FROM clause.",
+    # 200 codes relate to required explicit syntax (we could loosen these?)
+    201: 'Alias must be specified with "AS" - e.g. `SELECT x AS y`',
+    210: "Order by must be explicit about direction - specify `asc` or `desc`.",
+}
+
+
 def parse_text(
     text: str,
     environment: Optional[Environment] = None,
@@ -2135,9 +2149,43 @@ def parse_text(
         ValidationError,
         TypeError,
     ) as e:
-        if isinstance(
-            e, (UnexpectedCharacters, UnexpectedEOF, UnexpectedInput, UnexpectedToken)
-        ):
+        if isinstance(e, UnexpectedToken):
+            if e.expected == {"ORDERING_DIRECTION"}:
+                code = 210
+                raise InvalidSyntaxException(
+                    f"Syntax [{code}]:"
+                    + ERROR_CODES[code]
+                    + "\nContext:\n"
+                    + e.get_context(text.replace("\n", " "), 20)
+                )
+            parsed_tokens = (
+                [x.value for x in e.token_history] if e.token_history else []
+            )
+            if parsed_tokens == ["FROM"]:
+                code = 101
+                raise InvalidSyntaxException(
+                    f"Syntax [{code}]:"
+                    + ERROR_CODES[code]
+                    + "\nContext:\n"
+                    + e.get_context(text.replace("\n", " "), 20)
+                )
+            # recovery attempt for aliasing
+            try:
+                e.interactive_parser.feed_token(Token("AS", "AS"))
+                e.interactive_parser.feed_token(e.token)
+                raise InvalidSyntaxException(
+                    f"Syntax [{ERROR_CODES[201]}]:"
+                    + ERROR_CODES[201]
+                    + "\nContext:\n"
+                    + e.get_context(text.replace("\n", " "), 20)
+                )
+            except UnexpectedToken:
+                pass
+            raise InvalidSyntaxException(
+                str(e) + "\nContext:\n" + e.get_context(text.replace("\n", " "), 20)
+            )
+        elif isinstance(e, (UnexpectedCharacters, UnexpectedEOF, UnexpectedInput)):
+
             raise InvalidSyntaxException(
                 str(e) + "\nContext:\n" + e.get_context(text.replace("\n", " "), 20)
             )

{pytrilogy-0.0.3.75 → pytrilogy-0.0.3.77}/trilogy/parsing/trilogy.lark

@@ -130,7 +130,9 @@
     
     over_list: concept_lit (","  concept_lit )* ","?
     
-    !ordering: /ASC|DESC/i  ("NULLS"i /FIRST|LAST|AUTO/i )?
+    ORDERING_DIRECTION: /ASC|DESC/i
+
+    !ordering: ORDERING_DIRECTION  ("NULLS"i /FIRST|LAST|AUTO/i )?
     
     order_by: "ORDER"i "BY"i order_list