pytrilogy 0.0.3.22__tar.gz → 0.0.3.24__tar.gz

{pytrilogy-0.0.3.22/pytrilogy.egg-info → pytrilogy-0.0.3.24}/PKG-INFO

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

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/tests/test_typing.py

@@ -1,6 +1,25 @@
 from decimal import Decimal
+from pathlib import Path
+
+from pytest import raises
 
 from trilogy import Dialects
+from trilogy.parsing.exceptions import ParseError
+
+FILE = Path(__file__)
+
+
+def test_invalid_typing():
+    env = Dialects.DUCK_DB.default_executor()
+    with raises(ParseError):
+        env.environment.parse(
+            """
+    key customer_id int;
+    property customer_id.email string::email;
+
+
+    """
+        )
 
 
 def test_typing():
@@ -44,6 +63,58 @@ customer_id,
     assert env.environment.concepts["email"].datatype.traits == ["email"]
 
 
+def test_type_import_and_cast():
+    env = Dialects.DUCK_DB.default_executor()
+    env.environment.add_file_import(FILE.parent / "test_env_types.preql", "dtypes")
+    env.environment.parse(
+        """
+
+type year int;
+key customer_id int;
+property customer_id.signup_date date;
+
+datasource customers (
+    id:customer_id,
+    signup_date: signup_date
+)
+grain (customer_id)
+query '''
+select 1 as id, cast('2023-01-01' as date) as signup_date
+union all
+select 2 as id, cast('2023-01-02' as date) as signup_date
+''';
+
+"""
+    )
+    assert env.environment.concepts["signup_date"].keys == {"local.customer_id"}
+    assert env.environment.concepts["signup_date.year"].keys == {"local.signup_date"}
+    results = env.execute_query(
+        """SELECT
+    signup_date.year::int::year as signup_year;"""
+    )
+
+    for row in results.fetchall():
+        assert row.signup_year == 2023
+
+    assert "year" in env.environment.data_types
+
+    assert env.environment.concepts["signup_year"].datatype.traits == ["year"]
+
+    results = env.execute_query(
+        """SELECT
+signup_date.year::int::dtypes.year as signup_year_two;"""
+    )
+
+    for row in results.fetchall():
+        assert row.signup_year_two == 2023
+
+    assert "dtypes.year" in env.environment.data_types
+
+    assert env.environment.concepts["signup_year_two"].datatype.traits == [
+        "dtypes.year"
+    ]
+
+
 def test_typing_aggregate():
     env = Dialects.DUCK_DB.default_executor()
     env.environment.parse(

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

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/core/environment_helpers.py

@@ -54,7 +54,7 @@ def generate_date_concepts(concept: Concept, environment: Environment):
             grain=concept.grain,
             namespace=concept.namespace,
             keys=set(
-                concept.address,
+                [concept.address],
             ),
             metadata=Metadata(
                 description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}. ",
@@ -102,7 +102,7 @@ def generate_datetime_concepts(concept: Concept, environment: Environment):
             grain=concept.grain,
             namespace=concept.namespace,
             keys=set(
-                concept.address,
+                [concept.address],
             ),
             metadata=Metadata(
                 description=f"Auto-derived from {base_description}. {FUNCTION_DESCRIPTION_MAPS.get(ftype, ftype.value)}.",

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/core/functions.py

@@ -717,7 +717,6 @@ class FunctionFactory:
                 output_purpose = Purpose.METRIC
             else:
                 output_purpose = Purpose.PROPERTY
-
         return Function(
             operator=operator,
             arguments=full_args,

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/core/models/author.py

@@ -1035,6 +1035,7 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
                     pkeys.update(parent_keys)
             raw_keys = pkeys
             # deduplicate
+
             final_grain = Grain.from_concepts(raw_keys, environment)
             keys = final_grain.components
         return new_lineage, final_grain, keys
@@ -2244,6 +2245,11 @@ class CustomType(BaseModel):
     name: str
     type: DataType
 
+    def with_namespace(self, namespace: str) -> "CustomType":
+        return CustomType.model_construct(
+            name=address_with_namespace(self.name, namespace), type=self.type
+        )
+
 
 Expr = (
     MagicConstants
@@ -2284,6 +2290,7 @@ FuncArgs = (
     | date
     | datetime
     | MapWrapper[Any, Any]
+    | TraitDataType
     | DataType
     | ListType
     | MapType

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/core/models/build.py

@@ -77,6 +77,7 @@ from trilogy.core.models.core import (
     MapWrapper,
     NumericType,
     StructType,
+    TraitDataType,
     TupleWrapper,
     arg_to_datatype,
 )
@@ -1066,7 +1067,9 @@ class BuildFunction(DataTyped, BuildConceptArgs, BaseModel):
     # class BuildFunction(Function):
     operator: FunctionType
     arg_count: int = Field(default=1)
-    output_datatype: DataType | ListType | StructType | MapType | NumericType
+    output_datatype: (
+        DataType | ListType | StructType | MapType | NumericType | TraitDataType
+    )
     output_purpose: Purpose
     valid_inputs: Optional[
         Union[
@@ -1082,6 +1085,7 @@ class BuildFunction(DataTyped, BuildConceptArgs, BaseModel):
             date,
             datetime,
             MapWrapper[Any, Any],
+            TraitDataType,
             DataType,
             ListType,
             MapType,
@@ -1721,6 +1725,10 @@ class Factory:
             components=base.components, where_clause=where
         )
 
+    @build.register
+    def _(self, base: TupleWrapper) -> TupleWrapper:
+        return TupleWrapper(val=[self.build(x) for x in base.val], type=base.type)
+
     @build.register
     def _(self, base: FilterItem) -> BuildFilterItem:
         return BuildFilterItem.model_construct(
@@ -1869,6 +1877,10 @@ class Factory:
         new.gen_concept_list_caches()
         return new
 
+    @build.register
+    def _(self, base: TraitDataType):
+        return base
+
     @build.register
     def _(self, base: Datasource):
         local_cache: dict[str, BuildConcept] = {}

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/core/models/core.py

@@ -111,6 +111,9 @@ class TraitDataType(BaseModel):
     def __hash__(self):
         return hash(self.type)
 
+    def __str__(self) -> str:
+        return f"Trait<{self.type}, {self.traits}>"
+
     def __eq__(self, other):
         if isinstance(other, DataType):
             return self.type == other
@@ -382,6 +385,8 @@ def arg_to_datatype(arg) -> CONCRETE_TYPES:
         return DataType.FLOAT
     elif isinstance(arg, NumericType):
         return arg
+    elif isinstance(arg, TraitDataType):
+        return arg
     elif isinstance(arg, ListWrapper):
         return ListType(type=arg.type)
     elif isinstance(arg, DataTyped):

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/core/models/environment.py

@@ -442,6 +442,13 @@ class Environment(BaseModel):
                 self.functions[address_with_namespace(key, alias)] = (
                     function.with_namespace(alias)
                 )
+        for key, type in source.data_types.items():
+            if same_namespace:
+                self.data_types[key] = type
+            else:
+                self.data_types[address_with_namespace(key, alias)] = (
+                    type.with_namespace(alias)
+                )
         return self
 
     def add_file_import(

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/core/models/execute.py

@@ -162,7 +162,7 @@ class CTE(BaseModel):
             base += (
                 f"\n-- Nullable: {', '.join([str(x) for x in self.nullable_concepts])}."
             )
-        base +='\n'
+        base += "\n"
         return base
 
     def inline_parent_datasource(

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/core/processing/concept_strategies_v3.py

@@ -788,14 +788,16 @@ def _search_concepts(
         # if anything we need to get is in the filter set and it's a computed value
         # we need to get _everything_ in this loop
         required_filters = [
-                x 
-                for x in mandatory_list if x.derivation not in (Derivation.ROOT, Derivation.CONSTANT)
-                and not (x.derivation == Derivation.AGGREGATE and x.granularity == Granularity.SINGLE_ROW)
-                and x.address in conditions.row_arguments
-            ]
-        if any(
-            required_filters
-        ):
+            x
+            for x in mandatory_list
+            if x.derivation not in (Derivation.ROOT, Derivation.CONSTANT)
+            and not (
+                x.derivation == Derivation.AGGREGATE
+                and x.granularity == Granularity.SINGLE_ROW
+            )
+            and x.address in conditions.row_arguments
+        ]
+        if any(required_filters):
             logger.info(
                 f"{depth_to_prefix(depth)}{LOGGER_PREFIX} derived condition row inputs {[x.address for x in required_filters]} present in mandatory list, forcing condition evaluation at this level. "
             )

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/core/processing/utility.py

@@ -38,6 +38,7 @@ from trilogy.core.models.core import (
     MapType,
     MapWrapper,
     NumericType,
+    TraitDataType,
     TupleWrapper,
 )
 from trilogy.core.models.execute import (
@@ -441,6 +442,7 @@ def is_scalar_condition(
         | BuildCaseWhen
         | BuildCaseElse
         | MagicConstants
+        | TraitDataType
         | DataType
         | MapWrapper[Any, Any]
         | ListType

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/dialect/base.py

@@ -36,6 +36,7 @@ from trilogy.core.models.core import (
     MapWrapper,
     NumericType,
     StructType,
+    TraitDataType,
     TupleWrapper,
 )
 from trilogy.core.models.datasource import Datasource, RawColumnExpr
@@ -510,6 +511,7 @@ class BaseDialect:
             date,
             datetime,
             DataType,
+            TraitDataType,
             MagicConstants,
             MapWrapper[Any, Any],
             MapType,
@@ -677,6 +679,8 @@ class BaseDialect:
             return self.FUNCTION_MAP[FunctionType.DATE_LITERAL](e)
         elif isinstance(e, datetime):
             return self.FUNCTION_MAP[FunctionType.DATETIME_LITERAL](e)
+        elif isinstance(e, TraitDataType):
+            return self.DATATYPE_MAP.get(e.type, e.type.value)
         else:
             raise ValueError(f"Unable to render type {type(e)} {e}")
 

{pytrilogy-0.0.3.22 → pytrilogy-0.0.3.24}/trilogy/parsing/parse_engine.py

@@ -443,8 +443,9 @@ class ParseToObjects(Transformer):
     def map_type(self, args) -> MapType:
         return MapType(key_type=args[0], value_type=args[1])
 
+    @v_args(meta=True)
     def data_type(
-        self, args
+        self, meta: Meta, args
     ) -> DataType | TraitDataType | ListType | StructType | MapType | NumericType:
         resolved = args[0]
         traits = args[2:]
@@ -458,7 +459,13 @@ class ParseToObjects(Transformer):
             return resolved
         base = DataType(args[0].lower())
         if traits:
+            for trait in traits:
+                if trait not in self.environment.data_types:
+                    raise ParseError(
+                        f"Invalid type trait {trait} for {base}, line {meta.line}"
+                    )
             return TraitDataType(type=base, traits=traits)
+
         return base
 
     def array_comparison(self, args) -> ComparisonOperator:
@@ -1238,8 +1245,9 @@ class ParseToObjects(Transformer):
     def type_declaration(self, meta: Meta, args) -> TypeDeclaration:
         key = args[0]
         datatype = args[1]
-        self.environment.data_types[key] = datatype
-        return TypeDeclaration(type=CustomType(name=key, type=datatype))
+        new = CustomType(name=key, type=datatype)
+        self.environment.data_types[key] = new
+        return TypeDeclaration(type=new)
 
     def int_lit(self, args):
         return int("".join(args))
@@ -1342,7 +1350,10 @@ class ParseToObjects(Transformer):
         )
 
     def expr_tuple(self, args):
-        return TupleWrapper(content=tuple(args))
+        datatypes = set([arg_to_datatype(x) for x in args])
+        if len(datatypes) != 1:
+            raise ParseError("Tuple must have same type for all elements")
+        return TupleWrapper(val=tuple(args), type=datatypes.pop())
 
     def parenthetical(self, args):
         return Parenthetical(content=args[0])