pytrilogy 0.0.3.39__tar.gz → 0.0.3.41__tar.gz

{pytrilogy-0.0.3.39/pytrilogy.egg-info → pytrilogy-0.0.3.41}/PKG-INFO

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

{pytrilogy-0.0.3.39 → pytrilogy-0.0.3.41/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.39 → pytrilogy-0.0.3.41}/tests/test_parsing.py

@@ -3,6 +3,7 @@ from pytest import raises
 from trilogy import Dialects
 from trilogy.constants import MagicConstants, Parsing
 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 (
@@ -730,10 +731,36 @@ select [5,6,7,8] as int_array, 4 as scalar
 
 SELECT
     int_array,
-    sum(scalar)->scalar
+    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.39 → pytrilogy-0.0.3.41}/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.39"
+__version__ = "0.0.3.41"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.39 → pytrilogy-0.0.3.41}/trilogy/core/environment_helpers.py

@@ -1,7 +1,7 @@
 from trilogy.constants import DEFAULT_NAMESPACE
 from trilogy.core.enums import ConceptSource, DatePart, FunctionType, Purpose
 from trilogy.core.functions import AttrAccess
-from trilogy.core.models.author import Concept, Function, Metadata, TraitDataType
+from trilogy.core.models.author import Concept, Function, Grain, Metadata, TraitDataType
 from trilogy.core.models.core import DataType, StructType, arg_to_datatype
 from trilogy.core.models.environment import Environment
 from trilogy.parsing.common import Meta
@@ -67,7 +67,7 @@ def generate_date_concepts(concept: Concept, environment: Environment):
                 [concept.address],
             ),
             metadata=Metadata(
-                description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}. ",
+                description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}",
                 line_number=base_line_number,
                 concept_source=ConceptSource.AUTO_DERIVED,
             ),
@@ -89,7 +89,7 @@ def generate_date_concepts(concept: Concept, environment: Environment):
             datatype=DataType.DATE,
             purpose=Purpose.PROPERTY,
             lineage=function,
-            grain=concept.grain,
+            grain=concept.grain.model_copy(),
             namespace=concept.namespace,
             keys=set(
                 [concept.address],
@@ -137,16 +137,16 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
         )
         new_concept = Concept.model_construct(
             name=f"{concept.name}.{fname}",
-            datatype=const_function.output_datatype,
+            datatype=datatype,
             purpose=default_type,
             lineage=const_function,
-            grain=concept.grain,
+            grain=concept.grain.model_copy(),
             namespace=concept.namespace,
             keys=set(
                 [concept.address],
             ),
             metadata=Metadata(
-                description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}.",
+                description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}",
                 line_number=base_line_number,
                 concept_source=ConceptSource.AUTO_DERIVED,
             ),
@@ -182,11 +182,9 @@ def generate_key_concepts(concept: Concept, environment: Environment):
             datatype=DataType.INTEGER,
             purpose=default_type,
             lineage=const_function,
-            grain=concept.grain,
+            grain=Grain(),
             namespace=concept.namespace,
-            keys={
-                concept.address,
-            },
+            keys=set(),
             metadata=Metadata(
                 description=f"Auto-derived integer. The {ftype.value} of {concept.address}, {base_description}",
                 line_number=base_line_number,

{pytrilogy-0.0.3.39 → pytrilogy-0.0.3.41}/trilogy/core/models/build.py

@@ -1697,6 +1697,7 @@ class Factory:
 
     @build.register
     def _(self, base: WhereClause) -> BuildWhereClause:
+
         return BuildWhereClause.model_construct(
             conditional=self.build(base.conditional)
         )
@@ -1756,14 +1757,14 @@ class Factory:
         from trilogy.parsing.common import arbitrary_to_concept
 
         left = base.left
-        if isinstance(left, AggregateWrapper):
+        if isinstance(left, (AggregateWrapper, WindowItem, FilterItem)):
             left_c = arbitrary_to_concept(
                 left,
                 environment=self.environment,
             )
             left = left_c  # type: ignore
         right = base.right
-        if isinstance(right, AggregateWrapper):
+        if isinstance(right, (AggregateWrapper, WindowItem, FilterItem)):
             right_c = arbitrary_to_concept(
                 right,
                 environment=self.environment,

{pytrilogy-0.0.3.39 → pytrilogy-0.0.3.41}/trilogy/core/models/environment.py

@@ -420,9 +420,9 @@ class Environment(BaseModel):
             if INTERNAL_NAMESPACE in concept.address:
                 continue
             if same_namespace:
-                new = self.add_concept(concept)
+                new = self.add_concept(concept, add_derived=False)
             else:
-                new = self.add_concept(concept.with_namespace(alias))
+                new = self.add_concept(concept.with_namespace(alias), add_derived=False)
 
                 k = address_with_namespace(k, alias)
             # set this explicitly, to handle aliasing

{pytrilogy-0.0.3.39 → pytrilogy-0.0.3.41}/trilogy/parsing/common.py

@@ -577,6 +577,7 @@ def agg_wrapper_to_concept(
     # derivation = Concept.calculate_derivation(parent, Purpose.PROPERTY)
     grain = Grain.from_concepts(parent.by, environment) if parent.by else Grain()
     granularity = Concept.calculate_granularity(Derivation.AGGREGATE, grain, parent)
+
     out = Concept(
         name=name,
         datatype=aggfunction.output_datatype,
@@ -590,6 +591,11 @@ def agg_wrapper_to_concept(
         derivation=Derivation.AGGREGATE,
         granularity=granularity,
     )
+    for x in parent.function.concept_arguments:
+        if x.address == out.address:
+            raise InvalidSyntaxException(
+                f"Aggregate concept {out.address} cannot reference itself. If defining a new concept in a select, use a new name."
+            )
     return out