pytrilogy 0.0.3.42__tar.gz → 0.0.3.43__tar.gz

{pytrilogy-0.0.3.42/pytrilogy.egg-info → pytrilogy-0.0.3.43}/PKG-INFO

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

{pytrilogy-0.0.3.42 → pytrilogy-0.0.3.43/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.42 → pytrilogy-0.0.3.43}/pytrilogy.egg-info/SOURCES.txt

@@ -23,6 +23,7 @@ tests/test_models.py
 tests/test_multi_join_assignments.py
 tests/test_parse_engine.py
 tests/test_parsing.py
+tests/test_parsing_failures.py
 tests/test_partial_handling.py
 tests/test_query_processing.py
 tests/test_query_render.py

{pytrilogy-0.0.3.42 → pytrilogy-0.0.3.43}/tests/test_parsing.py

@@ -1,9 +1,6 @@
-from pytest import raises
-
 from trilogy import Dialects
-from trilogy.constants import MagicConstants, Parsing
+from trilogy.constants import MagicConstants
 from trilogy.core.enums import BooleanOperator, ComparisonOperator, Purpose
-from trilogy.core.exceptions import InvalidSyntaxException
 from trilogy.core.functions import argument_to_purpose, function_args_to_output_purpose
 from trilogy.core.models.author import Comparison
 from trilogy.core.models.core import (
@@ -20,7 +17,6 @@ from trilogy.core.statements.author import SelectStatement, ShowStatement
 from trilogy.core.statements.execute import ProcessedQuery
 from trilogy.dialect.base import BaseDialect
 from trilogy.parsing.parse_engine import (
-    ParseError,
     arg_to_datatype,
     parse_text,
 )
@@ -668,99 +664,3 @@ select x % 10 -> x_mod_10;
             
 """
     )
-
-
-def test_import_shows_source():
-
-    env = Environment(
-        config=EnvironmentOptions(
-            import_resolver=DictImportResolver(
-                content={
-                    "test": """
-import test_dep as test_dep;
-key x int;
-datasource test (
-x: x)
-grain(x)
-query '''
-select 1 as x
-union all
-select 11 as x
-''' TYPO
-""",
-                    "test_dep": """
-key x int;
-""",
-                }
-            )
-        )
-    )
-    assert isinstance(env.config.import_resolver, DictImportResolver)
-
-    with raises(Exception, match="Unable to import 'test', parsing error") as e:
-        env.parse(
-            """
-        import test;
-                
-    select x % 10 -> x_mod_10;
-                
-                
-    """
-        )
-        assert "TYPO" in str(e.value)
-        assert 1 == 0
-
-
-def test_concept_shadow_warning():
-    x = """
-key scalar int;    
-property scalar.int_array list<int>;
-
-key split <- unnest(int_array);
-
-datasource avalues (
-    int_array: int_array,
-	scalar: scalar
-    ) 
-grain (scalar) 
-query '''(
-select [1,2,3,4] as int_array, 2 as scalar
-union all
-select [5,6,7,8] as int_array, 4 as scalar
-)''';
-
-SELECT
-    int_array,
-    1+2->scalar
-;
-"""
-    with raises(ParseError):
-        env, parsed = parse_text(
-            x, parse_config=Parsing(strict_name_shadow_enforcement=True)
-        )
-    x = """
-key scalar int;    
-property scalar.int_array list<int>;
-
-key split <- unnest(int_array);
-
-datasource avalues (
-    int_array: int_array,
-	scalar: scalar
-    ) 
-grain (scalar) 
-query '''(
-select [1,2,3,4] as int_array, 2 as scalar
-union all
-select [5,6,7,8] as int_array, 4 as scalar
-)''';
-
-SELECT
-    int_array,
-    sum(scalar)->scalar
-;
-"""
-    with raises(InvalidSyntaxException):
-        env, parsed = parse_text(
-            x, parse_config=Parsing(strict_name_shadow_enforcement=True)
-        )

pytrilogy-0.0.3.43/tests/test_parsing_failures.py

@@ -0,0 +1,142 @@
+from pytest import raises
+
+from trilogy.constants import Parsing
+from trilogy.core.exceptions import InvalidSyntaxException
+from trilogy.core.models.environment import (
+    DictImportResolver,
+    Environment,
+    EnvironmentOptions,
+)
+from trilogy.parsing.parse_engine import (
+    ParseError,
+    parse_text,
+)
+
+
+def test_import_shows_source():
+
+    env = Environment(
+        config=EnvironmentOptions(
+            import_resolver=DictImportResolver(
+                content={
+                    "test": """
+import test_dep as test_dep;
+key x int;
+datasource test (
+x: x)
+grain(x)
+query '''
+select 1 as x
+union all
+select 11 as x
+''' TYPO
+""",
+                    "test_dep": """
+key x int;
+""",
+                }
+            )
+        )
+    )
+    assert isinstance(env.config.import_resolver, DictImportResolver)
+
+    with raises(Exception, match="Unable to import 'test', parsing error") as e:
+        env.parse(
+            """
+        import test;
+                
+    select x % 10 -> x_mod_10;
+                
+                
+    """
+        )
+        assert "TYPO" in str(e.value)
+        assert 1 == 0
+
+
+def test_concept_shadow_warning():
+    x = """
+key scalar int;    
+property scalar.int_array list<int>;
+
+key split <- unnest(int_array);
+
+datasource avalues (
+    int_array: int_array,
+	scalar: scalar
+    ) 
+grain (scalar) 
+query '''(
+select [1,2,3,4] as int_array, 2 as scalar
+union all
+select [5,6,7,8] as int_array, 4 as scalar
+)''';
+
+SELECT
+    int_array,
+    1+2->scalar
+;
+"""
+    with raises(ParseError):
+        env, parsed = parse_text(
+            x, parse_config=Parsing(strict_name_shadow_enforcement=True)
+        )
+    x = """
+key scalar int;    
+property scalar.int_array list<int>;
+
+key split <- unnest(int_array);
+
+datasource avalues (
+    int_array: int_array,
+	scalar: scalar
+    ) 
+grain (scalar) 
+query '''(
+select [1,2,3,4] as int_array, 2 as scalar
+union all
+select [5,6,7,8] as int_array, 4 as scalar
+)''';
+
+SELECT
+    int_array,
+    sum(scalar)->scalar
+;
+"""
+    with raises(InvalidSyntaxException):
+        env, parsed = parse_text(
+            x, parse_config=Parsing(strict_name_shadow_enforcement=True)
+        )
+
+
+def test_parsing_bad_order():
+    x = """
+key scalar int;    
+property scalar.int_array list<int>;
+
+key split <- unnest(int_array);
+
+datasource avalues (
+    int_array: int_array,
+	scalar: scalar
+    ) 
+grain (scalar) 
+query '''(
+select [1,2,3,4] as int_array, 2 as scalar
+union all
+select [5,6,7,8] as int_array, 4 as scalar
+)''';
+
+SELECT
+    int_array,
+    sum(scalar)->scalar
+order 
+    int_array asc
+;
+"""
+    with raises(InvalidSyntaxException) as e:
+
+        env, parsed = parse_text(
+            x, parse_config=Parsing(strict_name_shadow_enforcement=True)
+        )
+        assert "^" in str(e)

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

{pytrilogy-0.0.3.42 → pytrilogy-0.0.3.43}/trilogy/core/processing/node_generators/window_node.py

@@ -61,6 +61,9 @@ def gen_window_node(
     # append in keys to get the right grain
     if concept.keys:
         for item in concept.keys:
+            logger.info(
+                f"{padding(depth)}{LOGGER_PREFIX} appending search for key {item}"
+            )
             targets.append(environment.concepts[item])
     additional_outputs = []
     if equivalent_optional:
@@ -72,10 +75,15 @@ def gen_window_node(
             additional_outputs.append(x)
 
     grain_equivalents = [
-        x for x in local_optional if x.keys and all([key in targets for key in x.keys])
+        x
+        for x in local_optional
+        if x.keys
+        and all([key in targets for key in x.keys])
+        and x.grain == concept.grain
     ]
 
     for x in grain_equivalents:
+        logger.info("Appending grain equivalent %s", x)
         targets.append(x)
 
     # finally, the ones we'll need to enrich

{pytrilogy-0.0.3.42 → pytrilogy-0.0.3.43}/trilogy/dialect/bigquery.py

@@ -34,7 +34,7 @@ FUNCTION_MAP = {
 
 FUNCTION_GRAIN_MATCH_MAP = {
     **FUNCTION_MAP,
-    FunctionType.COUNT: lambda args: f"{args[0]}",
+    FunctionType.COUNT: lambda args: "1",
     FunctionType.SUM: lambda args: f"{args[0]}",
     FunctionType.AVG: lambda args: f"{args[0]}",
 }

{pytrilogy-0.0.3.42 → pytrilogy-0.0.3.43}/trilogy/parsing/parse_engine.py

@@ -1464,7 +1464,7 @@ class ParseToObjects(Transformer):
         return DatePart(args.value)
 
     @v_args(meta=True)
-    def window_item(self, meta, args) -> WindowItem:
+    def window_item(self, meta: Meta, args) -> WindowItem:
         type: WindowType = args[0]
         order_by = []
         over = []
@@ -1486,7 +1486,10 @@ class ParseToObjects(Transformer):
             else:
                 concept = arbitrary_to_concept(item, environment=self.environment)
                 self.environment.add_concept(concept, meta=meta)
-        assert concept
+        if not concept:
+            raise ParseError(
+                f"Window statements must be on fields, not constants - error in: `{self.text_lookup[self.parse_address][meta.start_pos:meta.end_pos]}`"
+            )
         return WindowItem(
             type=type,
             content=concept.reference,
@@ -1815,16 +1818,24 @@ class ParseToObjects(Transformer):
         return self.function_factory.create_function(args, FunctionType.BOOL, meta)
 
 
-def unpack_visit_error(e: VisitError):
+def unpack_visit_error(e: VisitError, text: str | None = None):
     """This is required to get exceptions from imports, which would
     raise nested VisitErrors"""
     if isinstance(e.orig_exc, VisitError):
-        unpack_visit_error(e.orig_exc)
+        unpack_visit_error(e.orig_exc, text)
     elif isinstance(e.orig_exc, (UndefinedConceptException, ImportError)):
         raise e.orig_exc
     elif isinstance(e.orig_exc, (SyntaxError, TypeError)):
         if isinstance(e.obj, Tree):
-            raise InvalidSyntaxException(
+            if text:
+                extract = text[e.obj.meta.start_pos - 5 : e.obj.meta.end_pos + 5]
+                raise InvalidSyntaxException(
+                    str(e.orig_exc)
+                    + " in "
+                    + str(e.rule)
+                    + f" Line: {e.obj.meta.line} ({extract})"
+                )
+            InvalidSyntaxException(
                 str(e.orig_exc) + " in " + str(e.rule) + f" Line: {e.obj.meta.line}"
             )
         raise InvalidSyntaxException(str(e.orig_exc)).with_traceback(
@@ -1875,7 +1886,7 @@ def parse_text(
             f"Parse time: {end - start} for {len(text)} characters, {len(output)} objects"
         )
     except VisitError as e:
-        unpack_visit_error(e)
+        unpack_visit_error(e, text)
         # this will never be reached
         raise e
     except (
@@ -1886,6 +1897,12 @@ def parse_text(
         ValidationError,
         TypeError,
     ) as e:
+        if isinstance(
+            e, (UnexpectedCharacters, UnexpectedEOF, UnexpectedInput, UnexpectedToken)
+        ):
+            raise InvalidSyntaxException(
+                str(e) + "\nContext:\n" + e.get_context(text.replace("\n", " "), 20)
+            )
         raise InvalidSyntaxException(str(e))
 
     return environment, output