pytrilogy 0.0.3.51__tar.gz → 0.0.3.52__tar.gz

{pytrilogy-0.0.3.51/pytrilogy.egg-info → pytrilogy-0.0.3.52}/PKG-INFO

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

{pytrilogy-0.0.3.51 → pytrilogy-0.0.3.52/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.51 → pytrilogy-0.0.3.52}/tests/test_parsing.py

@@ -92,7 +92,12 @@ def test_arg_to_datatype():
 
 
 def test_argument_to_purpose(test_environment: Environment):
-    assert argument_to_purpose(1.00) == Purpose.CONSTANT
+    assert (
+        argument_to_purpose(
+            1.00,
+        )
+        == Purpose.CONSTANT
+    )
     assert argument_to_purpose("test") == Purpose.CONSTANT
     assert argument_to_purpose(test_environment.concepts["order_id"]) == Purpose.KEY
     assert (
@@ -100,19 +105,22 @@ def test_argument_to_purpose(test_environment: Environment):
             [
                 "test",
                 1.00,
-            ]
+            ],
+            test_environment,
         )
         == Purpose.CONSTANT
     )
     assert (
         function_args_to_output_purpose(
-            ["test", 1.00, test_environment.concepts["order_id"]]
+            ["test", 1.00, test_environment.concepts["order_id"]], test_environment
         )
         == Purpose.PROPERTY
     )
     unnest_env, parsed = parse_text("const random <- unnest([1,2,3,4]);")
     assert (
-        function_args_to_output_purpose([unnest_env.concepts["random"]])
+        function_args_to_output_purpose(
+            [unnest_env.concepts["random"]], test_environment
+        )
         == Purpose.PROPERTY
     )
 

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

{pytrilogy-0.0.3.51 → pytrilogy-0.0.3.52}/trilogy/core/functions.py

@@ -809,13 +809,14 @@ def create_function_derived_concept(
     namespace: str,
     operator: FunctionType,
     arguments: list[Concept],
+    environment: Environment,
     output_type: Optional[
         DataType | ListType | StructType | MapType | NumericType | TraitDataType
     ] = None,
     output_purpose: Optional[Purpose] = None,
 ) -> Concept:
     purpose = (
-        function_args_to_output_purpose(arguments)
+        function_args_to_output_purpose(arguments, environment=environment)
         if output_purpose is None
         else output_purpose
     )
@@ -868,13 +869,15 @@ def argument_to_purpose(arg) -> Purpose:
         raise ValueError(f"Cannot parse arg purpose for {arg} of type {type(arg)}")
 
 
-def function_args_to_output_purpose(args) -> Purpose:
+def function_args_to_output_purpose(args, environment: Environment) -> Purpose:
     has_metric = False
     has_non_constant = False
     has_non_single_row_constant = False
     if not args:
         return Purpose.CONSTANT
     for arg in args:
+        if isinstance(arg, ConceptRef):
+            arg = environment.concepts[arg.address]
         purpose = argument_to_purpose(arg)
         if purpose == Purpose.METRIC:
             has_metric = True

{pytrilogy-0.0.3.51 → pytrilogy-0.0.3.52}/trilogy/core/models/author.py

@@ -25,6 +25,7 @@ from pydantic import (
     ValidationInfo,
     computed_field,
     field_validator,
+    model_validator,
 )
 
 from trilogy.constants import DEFAULT_NAMESPACE, MagicConstants
@@ -621,8 +622,8 @@ class Comparison(ConceptArgs, Mergeable, DataTyped, Namespaced, BaseModel):
             return v.reference
         return v
 
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
+    @model_validator(mode="after")
+    def validate_comparison(self):
         if self.operator in (ComparisonOperator.IS, ComparisonOperator.IS_NOT):
             if self.right != MagicConstants.NULL and DataType.BOOL != arg_to_datatype(
                 self.right
@@ -632,7 +633,6 @@ class Comparison(ConceptArgs, Mergeable, DataTyped, Namespaced, BaseModel):
                 )
         elif self.operator in (ComparisonOperator.IN, ComparisonOperator.NOT_IN):
             right_type = arg_to_datatype(self.right)
-
             if isinstance(right_type, ListType) and not is_compatible_datatype(
                 arg_to_datatype(self.left), right_type.value_data_type
             ):
@@ -653,6 +653,8 @@ class Comparison(ConceptArgs, Mergeable, DataTyped, Namespaced, BaseModel):
                     f"Cannot compare {arg_to_datatype(self.left)} and {arg_to_datatype(self.right)} of different types with operator {self.operator} in {str(self)}"
                 )
 
+        return self
+
     def __add__(self, other):
         if other is None:
             return self
@@ -1022,7 +1024,7 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
         keys = self.keys
 
         if self.is_aggregate and isinstance(new_lineage, Function) and grain.components:
-            grain_components = [
+            grain_components: list[ConceptRef | Concept] = [
                 environment.concepts[c].reference for c in grain.components
             ]
             new_lineage = AggregateWrapper(function=new_lineage, by=grain_components)
@@ -1847,9 +1849,6 @@ class AggregateWrapper(Mergeable, DataTyped, ConceptArgs, Namespaced, BaseModel)
     function: Function
     by: List[ConceptRef | Concept] = Field(default_factory=list)
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
     @field_validator("by", mode="before")
     @classmethod
     def enforce_concept_ref(cls, v):

{pytrilogy-0.0.3.51 → pytrilogy-0.0.3.52}/trilogy/core/models/build.py

@@ -262,11 +262,8 @@ class BuildGrain(BaseModel):
     components: set[str] = Field(default_factory=set)
     where_clause: Optional[BuildWhereClause] = None
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-
     def without_condition(self):
-        return BuildGrain(components=self.components)
+        return BuildGrain.model_construct(components=self.components)
 
     @classmethod
     def from_concepts(
@@ -321,12 +318,12 @@ class BuildGrain(BaseModel):
                 # raise NotImplementedError(
                 #     f"Cannot merge grains with where clauses, self {self.where_clause} other {other.where_clause}"
                 # )
-        return BuildGrain(
+        return BuildGrain.model_construct(
             components=self.components.union(other.components), where_clause=where
         )
 
     def __sub__(self, other: "BuildGrain") -> "BuildGrain":
-        return BuildGrain(
+        return BuildGrain.model_construct(
             components=self.components.difference(other.components),
             where_clause=self.where_clause,
         )
@@ -637,9 +634,6 @@ class BuildComparison(BuildConceptArgs, ConstantInlineable, BaseModel):
     ]
     operator: ComparisonOperator
 
-    def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, **kwargs)
-
     def __add__(self, other):
         if other is None:
             return self

{pytrilogy-0.0.3.51 → pytrilogy-0.0.3.52}/trilogy/core/models/execute.py

@@ -1,9 +1,16 @@
 from __future__ import annotations
 
 from collections import defaultdict
-from typing import Any, Dict, List, Optional, Set, Union
-
-from pydantic import BaseModel, Field, ValidationInfo, computed_field, field_validator
+from typing import Dict, List, Optional, Set, Union
+
+from pydantic import (
+    BaseModel,
+    Field,
+    ValidationInfo,
+    computed_field,
+    field_validator,
+    model_validator,
+)
 
 from trilogy.constants import CONFIG, logger
 from trilogy.core.constants import CONSTANT_DATASET
@@ -473,8 +480,8 @@ class BaseJoin(BaseModel):
     left_datasource: Optional[Union[BuildDatasource, "QueryDatasource"]] = None
     concept_pairs: list[ConceptPair] | None = None
 
-    def __init__(self, **data: Any):
-        super().__init__(**data)
+    @model_validator(mode="after")
+    def validate_join(self) -> "BaseJoin":
         if (
             self.left_datasource
             and self.left_datasource.identifier == self.right_datasource.identifier
@@ -483,14 +490,18 @@ class BaseJoin(BaseModel):
                 f"Cannot join a dataself to itself, joining {self.left_datasource} and"
                 f" {self.right_datasource}"
             )
-        final_concepts = []
 
-        # if we have a list of concept pairs
+        # Early returns maintained as in original code
         if self.concept_pairs:
-            return
+            return self
+
         if self.concepts == []:
-            return
+            return self
+
+        # Validation logic
+        final_concepts = []
         assert self.left_datasource and self.right_datasource
+
         for concept in self.concepts or []:
             include = True
             for ds in [self.left_datasource, self.right_datasource]:
@@ -507,6 +518,7 @@ class BaseJoin(BaseModel):
                     )
             if include:
                 final_concepts.append(concept)
+
         if not final_concepts and self.concepts:
             # if one datasource only has constants
             # we can join on 1=1
@@ -519,11 +531,11 @@ class BaseJoin(BaseModel):
                     ]
                 ):
                     self.concepts = []
-                    return
+                    return self
                 # if everything is at abstract grain, we can skip joins
                 if all([c.grain.abstract for c in ds.output_concepts]):
                     self.concepts = []
-                    return
+                    return self
 
             left_keys = [c.address for c in self.left_datasource.output_concepts]
             right_keys = [c.address for c in self.right_datasource.output_concepts]
@@ -535,7 +547,9 @@ class BaseJoin(BaseModel):
                 f" right_keys {right_keys},"
                 f" provided join concepts {match_concepts}"
             )
+
         self.concepts = final_concepts
+        return self
 
     @property
     def unique_id(self) -> str:

{pytrilogy-0.0.3.51 → pytrilogy-0.0.3.52}/trilogy/parsing/common.py

@@ -62,7 +62,7 @@ def process_function_arg(
             operator=FunctionType.PARENTHETICAL,
             arguments=processed,
             output_datatype=arg_to_datatype(processed[0]),
-            output_purpose=function_args_to_output_purpose(processed),
+            output_purpose=function_args_to_output_purpose(processed, environment),
         )
     elif isinstance(arg, Function):
         # if it's not an aggregate function, we can skip the virtual concepts
@@ -140,7 +140,7 @@ def get_purpose_and_keys(
     args: Tuple[ConceptRef | Concept, ...] | None,
     environment: Environment,
 ) -> Tuple[Purpose, set[str] | None]:
-    local_purpose = purpose or function_args_to_output_purpose(args)
+    local_purpose = purpose or function_args_to_output_purpose(args, environment)
     if local_purpose in (Purpose.PROPERTY, Purpose.METRIC) and args:
         keys = concept_list_to_keys(args, environment)
     else:
@@ -548,7 +548,7 @@ def filter_item_to_concept(
 
     else:
         raise NotImplementedError(
-            f"Filter item with non ref content {parent.content} not yet supported"
+            f"Filter item with non ref content {parent.content} ({type(parent.content)}) not yet supported"
         )
     modifiers = get_upstream_modifiers(
         cparent.concept_arguments, environment=environment

{pytrilogy-0.0.3.51 → pytrilogy-0.0.3.52}/trilogy/parsing/parse_engine.py

@@ -1257,16 +1257,21 @@ class ParseToObjects(Transformer):
             intersection = base.locally_derived.intersection(pre_keys)
             if intersection:
                 for x in intersection:
-                    if (
-                        base.local_concepts[x].derivation
-                        == self.environment.concepts[x].derivation
+                    if str(base.local_concepts[x].lineage) == str(
+                        self.environment.concepts[x].lineage
                     ):
+                        local = base.local_concepts[x]
+                        friendly_name = (
+                            local.name
+                            if local.namespace == DEFAULT_NAMESPACE
+                            else local.namespace
+                        )
                         raise NameShadowError(
-                            f"Select statement {base} derives concept {x} with identical derivation as named concept. Use the named concept directly."
+                            f"Select statement {base} creates a new concept '{friendly_name}' with identical definition as the existing concept '{friendly_name}'. Replace {base.local_concepts[x].lineage} with a direct reference to {friendly_name}."
                         )
                 else:
                     raise NameShadowError(
-                        f"Select statement {base} creates new derived concepts {list(intersection)} with identical name(s) to existing concept(s). If these are identical, reference the concept directly. Otherwise alias your column as a new name."
+                        f"Select statement {base} creates new named concepts from calculations {list(intersection)} with identical name(s) to existing concept(s). Use new unique names for these."
                     )
         return base