pytrilogy 0.0.3.22__py3-none-any.whl → 0.0.3.24__py3-none-any.whl

{pytrilogy-0.0.3.22.dist-info → pytrilogy-0.0.3.24.dist-info}/METADATA

@@ -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.dist-info → pytrilogy-0.0.3.24.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.22.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=1qcH3mcGJGfd8RueLao8BkMgttF4E-nwXO82_8H_zUg,303
+pytrilogy-0.0.3.24.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=lsurlEjeCDppW8zebqegPu__ETOY8b2i8vxDeuU8hPw,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=5eQxk1A0pv-TQk3CCvgZCFA9_K-6nxrOm7E5Lxd7KIY,1652
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -13,31 +13,31 @@ trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
 trilogy/core/enums.py,sha256=wuW667WD3mhZnXmN2VXzohseHpdlmzrfLvPtQJNdhdw,7165
 trilogy/core/env_processor.py,sha256=pFsxnluKIusGKx1z7tTnfsd_xZcPy9pZDungkjkyvI0,3170
-trilogy/core/environment_helpers.py,sha256=oOpewPwMp8xOtx2ayeeyuLNUwr-cli7UanHKot5ebNY,7627
+trilogy/core/environment_helpers.py,sha256=LjB3UsLyw7TncgS8EiMGtovGU_txyUki_QK94rSsJq0,7631
 trilogy/core/ergonomics.py,sha256=e-7gE29vPLFdg0_A1smQ7eOrUwKl5VYdxRSTddHweRA,1631
 trilogy/core/exceptions.py,sha256=JPYyBcit3T_pRtlHdtKSeVJkIyWUTozW2aaut25A2xI,673
-trilogy/core/functions.py,sha256=E-OZZTshUNmEMMl8nhaUDUhQkr45gqUCdPaDiBlayic,25392
+trilogy/core/functions.py,sha256=U-IkBF-HEaGFXF-PgB993CVTnDFE850LHXW-HFfhttc,25391
 trilogy/core/graph_models.py,sha256=z17EoO8oky2QOuO6E2aMWoVNKEVJFhLdsQZOhC4fNLU,2079
 trilogy/core/internal.py,sha256=iicDBlC6nM8d7e7jqzf_ZOmpUsW8yrr2AA8AqEiLx-s,1577
 trilogy/core/optimization.py,sha256=xGO8piVsLrpqrx-Aid_Y56_5slSv4eZmlP64hCHRiEc,7957
 trilogy/core/query_processor.py,sha256=Do8YpdPBdsbKtl9n37hobzk8SORMGqH-e_zNNxd-BE4,19456
 trilogy/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/models/author.py,sha256=gsn_vkm8gvnwTvzgqOL5v3X1Lx4n8xg32tRwk_9Mxnc,73494
-trilogy/core/models/build.py,sha256=bO1qYvuGl6LeNGgsfS6ZHAzZBR2lBPLg-QJymp9hgkU,57235
+trilogy/core/models/author.py,sha256=skeALE9eDB58f3-fkJbWkmgTZfrO88fgFuYsbYnBvk0,73709
+trilogy/core/models/build.py,sha256=2K-dANoFFl36yFdEDf7FDL36zM8FKSzpjLT5K2Na8Kc,57549
 trilogy/core/models/build_environment.py,sha256=8UggvlPU708GZWYPJMc_ou2r7M3TY2g69eqGvz03YX0,5528
-trilogy/core/models/core.py,sha256=nb4h1HHm5_qwmUkYth4zRhEttS1EtsMZCP4vT20EEAE,10326
+trilogy/core/models/core.py,sha256=vK0JXLG3dFlF6BgigXShGqkVWSTqp3oxRpdadX0HpQM,10469
 trilogy/core/models/datasource.py,sha256=6RjJUd2u4nYmEwFBpJlM9LbHVYDv8iHJxqiBMZqUrwI,9422
-trilogy/core/models/environment.py,sha256=RlHNrRer4p1uSQM030iwGJL82M1hMyY5p8a550XTfUI,26606
-trilogy/core/models/execute.py,sha256=SG_qXK3hrorzcXi85iie1Z5FGnrSwCE4Zs9Ntj4Q1ok,34223
+trilogy/core/models/environment.py,sha256=eB52hyb1e9fJFybP5u5tUiaNbBHGXkMdm0i2V-LUUiw,26888
+trilogy/core/models/execute.py,sha256=KZHiovlSr_3ZjyzKD1mdBlAqnPCqFCChQkO4_4WlGtg,34224
 trilogy/core/optimizations/__init__.py,sha256=EBanqTXEzf1ZEYjAneIWoIcxtMDite5-n2dQ5xcfUtg,356
 trilogy/core/optimizations/base_optimization.py,sha256=gzDOKImoFn36k7XBD3ysEYDnbnb6vdVIztUfFQZsGnM,513
 trilogy/core/optimizations/inline_constant.py,sha256=lvNTIXaLNkw3HseJyXyDNk5R52doLU9sIg3pmU2_S08,1332
 trilogy/core/optimizations/inline_datasource.py,sha256=AHuTGh2x0GQ8usOe0NiFncfTFQ_KogdgDl4uucmhIbI,4241
 trilogy/core/optimizations/predicate_pushdown.py,sha256=g4AYE8Aw_iMlAh68TjNXGP754NTurrDduFECkUjoBnc,9399
 trilogy/core/processing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/processing/concept_strategies_v3.py,sha256=pDajPY0b3fa8qgg2jR6Qj30RMu-OBLztlsVRTgGJbeU,40500
+trilogy/core/processing/concept_strategies_v3.py,sha256=O-O08cGLl4XX3Faf59UlkFjsjzTU-QkzlDQ0mzY-LRE,40515
 trilogy/core/processing/graph_utils.py,sha256=8QUVrkE9j-9C1AyrCb1nQEh8daCe0u1HuXl-Te85lag,1205
-trilogy/core/processing/utility.py,sha256=Oc5tLGeDDpzhbfo2ZcF8ex1kez-NcJDMcG2Lm5BjS4c,20548
+trilogy/core/processing/utility.py,sha256=mnN_pewdpDgRou4QJ1JLcqYHyZdp8DrcsGsqW3QmA3o,20591
 trilogy/core/processing/node_generators/__init__.py,sha256=o8rOFHPSo-s_59hREwXMW6gjUJCsiXumdbJNozHUf-Y,800
 trilogy/core/processing/node_generators/basic_node.py,sha256=UVsXMn6jTjm_ofVFt218jAS11s4RV4zD781vP4im-GI,3371
 trilogy/core/processing/node_generators/common.py,sha256=ZsDzThjm_mAtdQpKAg8QIJiPVZ4KuUkKyilj4eOhSDs,9439
@@ -70,7 +70,7 @@ trilogy/core/statements/build.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hS
 trilogy/core/statements/common.py,sha256=KxEmz2ySySyZ6CTPzn0fJl5NX2KOk1RPyuUSwWhnK1g,759
 trilogy/core/statements/execute.py,sha256=cSlvpHFOqpiZ89pPZ5GDp9Hu6j6uj-5_h21FWm_L-KM,1248
 trilogy/dialect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/dialect/base.py,sha256=QxBqbMop8l1eD36RNxSNL8XWd0mbI71FryvW1XK5NuQ,40797
+trilogy/dialect/base.py,sha256=rQ1uj3Bn_O_SSQH27es9E1-Pr_Rhz3fZxe7acd6Amds,40949
 trilogy/dialect/bigquery.py,sha256=PkjFcNGZHYOe655PmJhb8a0afdFULuovqP0qQVO8m0I,2953
 trilogy/dialect/common.py,sha256=XjHkP8Dqezjkd2JU5xoAlMRS_6HNyXQCF4CykLK3C8o,5011
 trilogy/dialect/config.py,sha256=olnyeVU5W5T6b9-dMeNAnvxuPlyc2uefb7FRME094Ec,3834
@@ -91,13 +91,13 @@ trilogy/parsing/common.py,sha256=99tDKrpQTk-SpyTXUqKFtm-lfmhjCOQIn25hxbQvRRg,214
 trilogy/parsing/config.py,sha256=Z-DaefdKhPDmSXLgg5V4pebhSB0h590vI0_VtHnlukI,111
 trilogy/parsing/exceptions.py,sha256=92E5i2frv5hj9wxObJZsZqj5T6bglvPzvdvco_vW1Zk,38
 trilogy/parsing/helpers.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-trilogy/parsing/parse_engine.py,sha256=UiTrjU6Lpp25S-wly_pNS0wUYEsZpjHExxduArtE1vQ,60602
+trilogy/parsing/parse_engine.py,sha256=m1RiV2_zDH0UXovqrzjuF37M9HBSccamHcfg_rKr6Nc,61073
 trilogy/parsing/render.py,sha256=o_XuQWhcwx1lD9eGVqkqZEwkmQK0HdmWWokGBtdeH4I,17837
 trilogy/parsing/trilogy.lark,sha256=7libFS5HNiyHJYzr5_lEiY-Lpqit04_PgyIPHMZT7-w,12928
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
-pytrilogy-0.0.3.22.dist-info/METADATA,sha256=hRYKLlss7MfsGa488K07_o93KgVoI77O7QBqJ30vR4I,9100
-pytrilogy-0.0.3.22.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pytrilogy-0.0.3.22.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.22.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.22.dist-info/RECORD,,
+pytrilogy-0.0.3.24.dist-info/METADATA,sha256=IHMVK1xFCKTp8ECUjxcinjhzgKmU1MJaRZw2b8JSW5w,9100
+pytrilogy-0.0.3.24.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pytrilogy-0.0.3.24.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.24.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.24.dist-info/RECORD,,

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"]

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)}.",

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,

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

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] = {}

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):

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(

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(

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. "
             )

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

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}")
 

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])