pytrilogy 0.0.3.8__py3-none-any.whl → 0.0.3.10__py3-none-any.whl

{pytrilogy-0.0.3.8.dist-info → pytrilogy-0.0.3.10.dist-info}/METADATA

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

{pytrilogy-0.0.3.8.dist-info → pytrilogy-0.0.3.10.dist-info}/RECORD

@@ -1,31 +1,31 @@
-trilogy/__init__.py,sha256=OtihFBeuWR7p7GBhiNMfyCpmu-x2kn_W2xSawos5ILM,302
+trilogy/__init__.py,sha256=vUdxo3nPFBARzvUHLzXRZLQKmcfdfzLaKOQTAayfTYE,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=qZ1d0hoKPPV2HHCoFwPYTVB7b6bXjpWvXd3lE-zEhy8,1494
 trilogy/engine.py,sha256=3etkm2RSVKO0IkgPKkrcs33X5gN_fIMyqMNfChcsR1E,1318
-trilogy/executor.py,sha256=YgSCeeYVecI9526LGSLVe2apOo7Ddsttvs_nDC9yElQ,17194
+trilogy/executor.py,sha256=9HhdLQoou1Cy9KSDgpdYxK6uyg-UPkgx9jXJBuK5ITc,17271
 trilogy/parser.py,sha256=o4cfk3j3yhUFoiDKq9ZX_GjBF3dKhDjXEwb63rcBkBM,293
 trilogy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/utility.py,sha256=euQccZLKoYBz0LNg5tzLlvv2YHvXh9HArnYp1V3uXsM,763
-trilogy/authoring/__init__.py,sha256=6eIJewNIbrMdP6_dyLpyZ0uU62_pSj9wCP80Pkz2Bl8,1922
+trilogy/authoring/__init__.py,sha256=fP4oIRG41yW-gqpMjIOL0jBffh6Wlw8nR3HXhaPkKxc,2066
 trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
-trilogy/core/enums.py,sha256=aTFXL6nckmG0hpNLdCxI2kAT26cIsZPahF-pHzLQ9uc,7085
+trilogy/core/enums.py,sha256=jOgUyoLGgC5-8SLBWP0jQDMxptBJbN0J48VsCa1EMYo,7111
 trilogy/core/env_processor.py,sha256=pFsxnluKIusGKx1z7tTnfsd_xZcPy9pZDungkjkyvI0,3170
 trilogy/core/environment_helpers.py,sha256=oOpewPwMp8xOtx2ayeeyuLNUwr-cli7UanHKot5ebNY,7627
 trilogy/core/ergonomics.py,sha256=ASLDd0RqKWrZiG3XcKHo8nyTjaB_8xfE9t4NZ1UvGpc,1639
 trilogy/core/exceptions.py,sha256=JPYyBcit3T_pRtlHdtKSeVJkIyWUTozW2aaut25A2xI,673
-trilogy/core/functions.py,sha256=rIkZGzw9hpIkXvuqQ1qPWFJO1W_NPYc6T9t0wTZ55M0,24784
+trilogy/core/functions.py,sha256=EsRYHE2kg_FckceVgYGPPs1ylrXvBjr3l1Wa6r0SvL8,25027
 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=S6riJx8Z4_orbohjK3fcZh5Ei6nCPYAS2FGDsI2njHk,69488
-trilogy/core/models/build.py,sha256=z2QO7l2E2-1hHimmOGsLl42sTnEb2x9o45zkvOoJYpM,56687
+trilogy/core/models/author.py,sha256=CHVnj-GW_gjGDHaAUg60VGOfPSRr_5n5LbHvocOhQj8,70371
+trilogy/core/models/build.py,sha256=bO1qYvuGl6LeNGgsfS6ZHAzZBR2lBPLg-QJymp9hgkU,57235
 trilogy/core/models/build_environment.py,sha256=8UggvlPU708GZWYPJMc_ou2r7M3TY2g69eqGvz03YX0,5528
-trilogy/core/models/core.py,sha256=yie1uuq62uOQ5fjob9NMJbdvQPrCErXUT7JTCuYRyjI,9697
+trilogy/core/models/core.py,sha256=00opIUXwgJy9OF-cwI883zQpArNeh6wkTpSqUszDU78,9909
 trilogy/core/models/datasource.py,sha256=6RjJUd2u4nYmEwFBpJlM9LbHVYDv8iHJxqiBMZqUrwI,9422
-trilogy/core/models/environment.py,sha256=qFZ0_Op6zIhKc5oVS4EVYZ67f29wJhKP_xoEMV4kkuU,25991
+trilogy/core/models/environment.py,sha256=BpmHeSfIz_uNlx4IJ7LnDbQrQwEjNU7QoYcJn0uhpeo,26009
 trilogy/core/models/execute.py,sha256=ABylFQgtavjjCfFkEsFdUwfMB4UBQLHjdzQ9E67QlAE,33521
 trilogy/core/optimizations/__init__.py,sha256=EBanqTXEzf1ZEYjAneIWoIcxtMDite5-n2dQ5xcfUtg,356
 trilogy/core/optimizations/base_optimization.py,sha256=gzDOKImoFn36k7XBD3ysEYDnbnb6vdVIztUfFQZsGnM,513
@@ -63,12 +63,12 @@ trilogy/core/processing/nodes/union_node.py,sha256=fDFzLAUh5876X6_NM7nkhoMvHEdGJ
 trilogy/core/processing/nodes/unnest_node.py,sha256=oLKMMNMx6PLDPlt2V5neFMFrFWxET8r6XZElAhSNkO0,2181
 trilogy/core/processing/nodes/window_node.py,sha256=STvwheVttxSWVHB-yUQUSo-Pyz7Uk8G1txFDAbWMp-s,1380
 trilogy/core/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/statements/author.py,sha256=9wKZDwQ-BeaUCMjD9l0ffMMv8zivaYcAg12UhVFi-0Y,14248
+trilogy/core/statements/author.py,sha256=X3NdGlWTUCNdQQw9EGI1kccgsLJMazwNAIsqpUSr_ZY,14443
 trilogy/core/statements/build.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=u00kIIl98as1QzcduiiyyoBzxRGVeBxfeO5hWlRCAJU,40222
+trilogy/dialect/base.py,sha256=gEbbqll98nfhxs_JWK0h_9M9fh4nWnon2Ntlxp_s_lI,40287
 trilogy/dialect/bigquery.py,sha256=mKC3zoEU232h9RtIXJjqiZ72lWH8a6S28p6wAZKrAfg,2952
 trilogy/dialect/common.py,sha256=cbTo_vamdp8pj9spSjGSH-bSZpy4FpNJ12k5vMvyT2Y,3942
 trilogy/dialect/config.py,sha256=EGYRQIbrkeMuud5Bkds7jSD5dCJR5hEYZUYcy-lYZl4,3308
@@ -85,18 +85,18 @@ trilogy/hooks/graph_hook.py,sha256=c-vC-IXoJ_jDmKQjxQyIxyXPOuUcLIURB573gCsAfzQ,2
 trilogy/hooks/query_debugger.py,sha256=1npRjww94sPV5RRBBlLqMJRaFkH9vhEY6o828MeoEcw,5583
 trilogy/metadata/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/parsing/common.py,sha256=RwO9CdNYy3KxJCjg5Ta_xJwfZHV2PuRErxg66Cs50ws,20490
+trilogy/parsing/common.py,sha256=IgZ2K3LzJ0usLIwxRCRmS-4luP6uwmM-f1oqGNyGbm0,21306
 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=uZ6MYjg6kkTm5HFfOKLGvVvzHiGgH-vY7lV-AIlIBgY,55701
+trilogy/parsing/parse_engine.py,sha256=MiH5Kw6U512oseE-7XMyDUJRmUtUqCCzjS8MKsywNoQ,56375
 trilogy/parsing/render.py,sha256=o_XuQWhcwx1lD9eGVqkqZEwkmQK0HdmWWokGBtdeH4I,17837
-trilogy/parsing/trilogy.lark,sha256=wZpqI1louDqm-t-TpmzW749dPA9w2EIAyowyEJIeXAM,12620
+trilogy/parsing/trilogy.lark,sha256=zehaPaYKuJZQ335sgCjH8Q6u_hy5A6A02XcdwziZdWE,12817
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
-pytrilogy-0.0.3.8.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.3.8.dist-info/METADATA,sha256=DAu0XOCyEgXpZj9-Znl0IbtouGXHELjt2EUZnp3IgEs,8983
-pytrilogy-0.0.3.8.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pytrilogy-0.0.3.8.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.3.8.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.8.dist-info/RECORD,,
+pytrilogy-0.0.3.10.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.3.10.dist-info/METADATA,sha256=LpLZFxaYTstBO1oc2-pil2pQNH-P7hrTkOQ35PWPm8A,8984
+pytrilogy-0.0.3.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pytrilogy-0.0.3.10.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.3.10.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.10.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.8"
+__version__ = "0.0.3.10"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/authoring/__init__.py

@@ -38,6 +38,9 @@ from trilogy.core.models.environment import Environment
 from trilogy.core.statements.author import (
     ConceptDeclarationStatement,
     ConceptTransform,
+    MultiSelectStatement,
+    PersistStatement,
+    RawSQLStatement,
     SelectItem,
     SelectStatement,
 )
@@ -87,4 +90,7 @@ __all__ = [
     "DEFAULT_NAMESPACE",
     "arbitrary_to_concept",
     "arg_to_datatype",
+    "MultiSelectStatement",
+    "PersistStatement",
+    "RawSQLStatement",
 ]

trilogy/core/enums.py

@@ -172,6 +172,7 @@ class FunctionType(Enum):
     UPPER = "upper"
     SUBSTRING = "substring"
     STRPOS = "strpos"
+    CONTAINS = "contains"
 
     # Dates
     DATE = "date"

trilogy/core/functions.py

@@ -271,6 +271,15 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type=DataType.INTEGER,
         arg_count=2,
     ),
+    FunctionType.CONTAINS: FunctionConfig(
+        valid_inputs=[
+            {DataType.STRING},
+            {DataType.STRING},
+        ],
+        output_purpose=Purpose.PROPERTY,
+        output_type=DataType.BOOL,
+        arg_count=2,
+    ),
     FunctionType.SUBSTRING: FunctionConfig(
         valid_inputs=[{DataType.STRING}, {DataType.INTEGER}, {DataType.INTEGER}],
         output_purpose=Purpose.PROPERTY,

trilogy/core/models/author.py

@@ -55,6 +55,7 @@ from trilogy.core.models.core import (
     MapWrapper,
     NumericType,
     StructType,
+    TraitDataType,
     TupleWrapper,
     arg_to_datatype,
     is_compatible_datatype,
@@ -101,9 +102,9 @@ class HasUUID(ABC):
 
 class ConceptRef(Addressable, Namespaced, DataTyped, Mergeable, BaseModel):
     address: str
-    datatype: DataType | ListType | StructType | MapType | NumericType = (
-        DataType.UNKNOWN
-    )
+    datatype: (
+        DataType | TraitDataType | ListType | StructType | MapType | NumericType
+    ) = DataType.UNKNOWN
     metadata: Optional["Metadata"] = None
 
     @property
@@ -547,6 +548,7 @@ class Comparison(ConceptArgs, Mergeable, Namespaced, BaseModel):
         MagicConstants,
         WindowItem,
         AggregateWrapper,
+        FilterItem,
     ]
     right: Union[
         int,
@@ -566,6 +568,7 @@ class Comparison(ConceptArgs, Mergeable, Namespaced, BaseModel):
         WindowItem,
         AggregateWrapper,
         TupleWrapper,
+        FilterItem,
     ]
     operator: ComparisonOperator
 
@@ -754,7 +757,7 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
         extra="forbid",
     )
     name: str
-    datatype: DataType | ListType | StructType | MapType | NumericType
+    datatype: DataType | TraitDataType | ListType | StructType | MapType | NumericType
     purpose: Purpose
     derivation: Derivation = Derivation.ROOT
     granularity: Granularity = Granularity.MULTI_ROW
@@ -1215,9 +1218,9 @@ class UndefinedConceptFull(Concept, Mergeable, Namespaced):
     model_config = ConfigDict(arbitrary_types_allowed=True)
     name: str
     line_no: int | None = None
-    datatype: DataType | ListType | StructType | MapType | NumericType = (
-        DataType.UNKNOWN
-    )
+    datatype: (
+        DataType | TraitDataType | ListType | StructType | MapType | NumericType
+    ) = DataType.UNKNOWN
     purpose: Purpose = Purpose.UNKNOWN
 
     @property
@@ -1249,7 +1252,7 @@ class OrderItem(Mergeable, ConceptArgs, Namespaced, BaseModel):
     def with_merge(
         self, source: Concept, target: Concept, modifiers: List[Modifier]
     ) -> "OrderItem":
-        return OrderItem(
+        return OrderItem.model_construct(
             expr=(
                 self.expr.with_merge(source, target, modifiers)
                 if isinstance(self.expr, Mergeable)
@@ -1258,6 +1261,16 @@ class OrderItem(Mergeable, ConceptArgs, Namespaced, BaseModel):
             order=self.order,
         )
 
+    def with_reference_replacement(self, source, target):
+        return OrderItem.model_construct(
+            expr=(
+                self.expr.with_reference_replacement(source, target)
+                if isinstance(self.expr, Mergeable)
+                else self.expr
+            ),
+            order=self.order,
+        )
+
     @property
     def concept_arguments(self) -> Sequence[ConceptRef]:
         return get_concept_arguments(self.expr)
@@ -1320,6 +1333,17 @@ class WindowItem(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
         )
         return output
 
+    def with_reference_replacement(self, source, target):
+        return WindowItem.model_construct(
+            type=self.type,
+            content=self.content.with_reference_replacement(source, target),
+            over=[x.with_reference_replacement(source, target) for x in self.over],
+            order_by=[
+                x.with_reference_replacement(source, target) for x in self.order_by
+            ],
+            index=self.index,
+        )
+
     def with_namespace(self, namespace: str) -> "WindowItem":
         return WindowItem.model_construct(
             type=self.type,
@@ -1515,30 +1539,7 @@ class Function(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
             List[Set[DataType]],
         ]
     ] = None
-    arguments: Sequence[
-        Union[
-            ConceptRef,
-            AggregateWrapper,
-            Function,
-            Parenthetical,
-            CaseWhen,
-            CaseElse,
-            WindowItem,
-            int,
-            float,
-            str,
-            date,
-            datetime,
-            MapWrapper[Any, Any],
-            DataType,
-            ListType,
-            MapType,
-            NumericType,
-            DatePart,
-            list,
-            ListWrapper[Any],
-        ]
-    ]
+    arguments: Sequence[FuncArgs]
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -2153,6 +2154,11 @@ class ArgBinding(BaseModel):
     default: Expr | None = None
 
 
+class CustomType(BaseModel):
+    name: str
+    type: DataType
+
+
 Expr = (
     MagicConstants
     | bool
@@ -2164,6 +2170,7 @@ Expr = (
     | datetime
     | TupleWrapper
     | ListWrapper
+    | MapWrapper
     | WindowItem
     | FilterItem
     | ConceptRef
@@ -2172,4 +2179,30 @@ Expr = (
     | Parenthetical
     | Function
     | AggregateWrapper
+    | CaseWhen
+    | CaseElse
+)
+
+FuncArgs = (
+    ConceptRef
+    | AggregateWrapper
+    | Function
+    | Parenthetical
+    | CaseWhen
+    | CaseElse
+    | WindowItem
+    | FilterItem
+    | int
+    | float
+    | str
+    | date
+    | datetime
+    | MapWrapper[Any, Any]
+    | DataType
+    | ListType
+    | MapType
+    | NumericType
+    | DatePart
+    | list
+    | ListWrapper[Any]
 )

trilogy/core/models/build.py

@@ -51,6 +51,7 @@ from trilogy.core.models.author import (
     ConceptRef,
     Conditional,
     FilterItem,
+    FuncArgs,
     Function,
     Grain,
     HavingClause,
@@ -1498,10 +1499,22 @@ class Factory:
 
     @build.register
     def _(self, base: Function) -> BuildFunction:
+        from trilogy.parsing.common import arbitrary_to_concept
 
+        raw_args: list[Concept | FuncArgs] = []
+        for arg in base.arguments:
+            # to do proper discovery, we need to inject virtual intermediate ocncepts
+            if isinstance(arg, (AggregateWrapper, FilterItem, WindowItem)):
+                narg = arbitrary_to_concept(
+                    arg,
+                    environment=self.environment,
+                )
+                raw_args.append(narg)
+            else:
+                raw_args.append(arg)
         new = BuildFunction.model_construct(
             operator=base.operator,
-            arguments=[self.build(c) for c in base.arguments],
+            arguments=[self.build(c) for c in raw_args],
             output_datatype=base.output_datatype,
             output_purpose=base.output_purpose,
             valid_inputs=base.valid_inputs,

trilogy/core/models/core.py

@@ -97,6 +97,19 @@ class DataType(Enum):
         return self
 
 
+class TraitDataType(BaseModel):
+    type: DataType
+    traits: list[str]
+
+    @property
+    def data_type(self):
+        return self.type
+
+    @property
+    def value(self):
+        return self.data_type.value
+
+
 class NumericType(BaseModel):
     precision: int = 20
     scale: int = 5

trilogy/core/models/environment.py

@@ -40,6 +40,7 @@ from trilogy.core.exceptions import (
 from trilogy.core.models.author import (
     Concept,
     ConceptRef,
+    CustomType,
     Function,
     SelectLineage,
     UndefinedConcept,
@@ -191,7 +192,7 @@ class Environment(BaseModel):
         EnvironmentDatasourceDict, PlainValidator(validate_datasources)
     ] = Field(default_factory=EnvironmentDatasourceDict)
     functions: Dict[str, Callable[..., Any]] = Field(default_factory=dict)
-    data_types: Dict[str, DataType] = Field(default_factory=dict)
+    data_types: Dict[str, CustomType] = Field(default_factory=dict)
     named_statements: Dict[str, SelectLineage] = Field(default_factory=dict)
     imports: Dict[str, list[Import]] = Field(
         default_factory=lambda: defaultdict(list)  # type: ignore

trilogy/core/statements/author.py

@@ -15,8 +15,11 @@ from trilogy.core.enums import (
 from trilogy.core.models.author import (
     AggregateWrapper,
     AlignClause,
+    ArgBinding,
     Concept,
     ConceptRef,
+    CustomType,
+    Expr,
     FilterItem,
     Function,
     Grain,
@@ -413,3 +416,13 @@ class ConceptDeclarationStatement(HasUUID, BaseModel):
 
 class ConceptDerivationStatement(BaseModel):
     concept: Concept
+
+
+class TypeDeclaration(BaseModel):
+    type: CustomType
+
+
+class FunctionDeclaration(BaseModel):
+    name: str
+    args: list[ArgBinding]
+    expr: Expr

trilogy/dialect/base.py

@@ -184,6 +184,7 @@ FUNCTION_MAP = {
     FunctionType.LOWER: lambda x: f"LOWER({x[0]}) ",
     FunctionType.SUBSTRING: lambda x: f"SUBSTRING({x[0]},{x[1]},{x[2]})",
     FunctionType.STRPOS: lambda x: f"STRPOS({x[0]},{x[1]})",
+    FunctionType.CONTAINS: lambda x: f"CONTAINS({x[0]},{x[1]})",
     # FunctionType.NOT_LIKE: lambda x: f" CASE WHEN {x[0]} like {x[1]} THEN 0 ELSE 1 END",
     # date types
     FunctionType.DATE_TRUNCATE: lambda x: f"date_trunc({x[0]},{x[1]})",

trilogy/executor.py

@@ -166,8 +166,11 @@ class Executor(object):
         )
 
     @execute_query.register
-    def _(self, query: str) -> CursorResult:
-        return self.execute_text(query)[-1]
+    def _(self, query: str) -> CursorResult | None:
+        results = self.execute_text(query)
+        if results:
+            return results[-1]
+        return None
 
     @execute_query.register
     def _(self, query: SelectStatement) -> CursorResult:

trilogy/parsing/common.py

@@ -84,7 +84,8 @@ def process_function_arg(
         environment.add_concept(concept, meta=meta)
         return concept
     elif isinstance(
-        arg, (FilterItem, WindowItem, AggregateWrapper, ListWrapper, MapWrapper)
+        arg,
+        (ListWrapper, MapWrapper),
     ):
         id_hash = string_to_hash(str(arg))
         name = f"{VIRTUAL_CONCEPT_PREFIX}_{id_hash}"
@@ -249,6 +250,24 @@ def concepts_to_grain_concepts(
     return v2
 
 
+def get_relevant_parent_concepts(arg) -> tuple[list[ConceptRef], bool]:
+    from trilogy.core.models.author import get_concept_arguments
+
+    is_metric = False
+    if isinstance(arg, Function):
+        all = []
+        for y in arg.arguments:
+            refs, local_flag = get_relevant_parent_concepts(y)
+            all += refs
+            is_metric = is_metric or local_flag
+        return all, is_metric
+    elif isinstance(arg, AggregateWrapper) and not arg.by:
+        return [], True
+    elif isinstance(arg, AggregateWrapper) and arg.by:
+        return arg.by, True
+    return get_concept_arguments(arg), False
+
+
 def function_to_concept(
     parent: Function,
     name: str,
@@ -256,14 +275,12 @@ def function_to_concept(
     namespace: str | None = None,
     metadata: Metadata | None = None,
 ) -> Concept:
+
     pkeys: List[Concept] = []
     namespace = namespace or environment.namespace
-    concrete_args = [
-        x
-        for x in [environment.concepts[c.address] for c in parent.concept_arguments]
-        if not isinstance(x, UndefinedConcept)
-    ]
-
+    is_metric = False
+    ref_args, is_metric = get_relevant_parent_concepts(parent)
+    concrete_args = [environment.concepts[c.address] for c in ref_args]
     pkeys += [x for x in concrete_args if not x.derivation == Derivation.CONSTANT]
     grain: Grain | None = Grain()
     for x in pkeys:
@@ -274,12 +291,18 @@ def function_to_concept(
     modifiers = get_upstream_modifiers(pkeys, environment)
     key_grain: list[str] = []
     for x in pkeys:
-        if x.keys:
+        # metrics will group to keys, so do no do key traversal
+        if is_metric:
+            key_grain.append(x.address)
+        # otherwse, for row ops, assume keys are transitive
+        elif x.keys:
             key_grain += [*x.keys]
         else:
             key_grain.append(x.address)
     keys = set(key_grain)
-    if not pkeys:
+    if is_metric:
+        purpose = Purpose.METRIC
+    elif not pkeys:
         purpose = Purpose.CONSTANT
     else:
         purpose = parent.output_purpose

trilogy/parsing/parse_engine.py

@@ -4,7 +4,7 @@ from enum import Enum
 from os.path import dirname, join
 from pathlib import Path
 from re import IGNORECASE
-from typing import Callable, List, Optional, Tuple, Union
+from typing import List, Optional, Tuple, Union
 
 from lark import Lark, ParseTree, Transformer, Tree, v_args
 from lark.exceptions import (
@@ -57,6 +57,7 @@ from trilogy.core.models.author import (
     Concept,
     ConceptRef,
     Conditional,
+    CustomType,
     Expr,
     FilterItem,
     Function,
@@ -82,6 +83,7 @@ from trilogy.core.models.core import (
     MapWrapper,
     NumericType,
     StructType,
+    TraitDataType,
     TupleWrapper,
     arg_to_datatype,
     dict_to_map_wrapper,
@@ -101,6 +103,7 @@ from trilogy.core.statements.author import (
     ConceptDerivationStatement,
     ConceptTransform,
     CopyStatement,
+    FunctionDeclaration,
     ImportStatement,
     Limit,
     MergeStatementV2,
@@ -111,6 +114,7 @@ from trilogy.core.statements.author import (
     SelectItem,
     SelectStatement,
     ShowStatement,
+    TypeDeclaration,
 )
 from trilogy.parsing.common import (
     align_item_to_concept,
@@ -365,8 +369,9 @@ class ParseToObjects(Transformer):
 
     def data_type(
         self, args
-    ) -> DataType | ListType | StructType | MapType | NumericType:
+    ) -> DataType | TraitDataType | ListType | StructType | MapType | NumericType:
         resolved = args[0]
+        traits = args[2:]
         if isinstance(resolved, StructType):
             return resolved
         elif isinstance(resolved, ListType):
@@ -375,7 +380,10 @@ class ParseToObjects(Transformer):
             return resolved
         elif isinstance(resolved, MapType):
             return resolved
-        return DataType(args[0].lower())
+        base = DataType(args[0].lower())
+        if traits:
+            return TraitDataType(type=base, traits=traits)
+        return base
 
     def array_comparison(self, args) -> ComparisonOperator:
         return ComparisonOperator([x.value.lower() for x in args])
@@ -1087,7 +1095,7 @@ class ParseToObjects(Transformer):
         return ArgBinding(name=args[0], default=None)
 
     @v_args(meta=True)
-    def raw_function(self, meta: Meta, args) -> Callable[[list[Expr]], Expr]:
+    def raw_function(self, meta: Meta, args) -> FunctionDeclaration:
         identity = args[0]
         function_arguments: list[ArgBinding] = args[1]
         output = args[2]
@@ -1109,7 +1117,7 @@ class ParseToObjects(Transformer):
             return nout
 
         self.environment.functions[identity] = function_factory
-        return function_factory
+        return FunctionDeclaration(name=identity, args=function_arguments, expr=output)
 
     def custom_function(self, args):
         name = args[0]
@@ -1121,6 +1129,13 @@ class ParseToObjects(Transformer):
     def function(self, meta: Meta, args) -> Function:
         return args[0]
 
+    @v_args(meta=True)
+    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))
+
     def int_lit(self, args):
         return int("".join(args))
 
@@ -1441,6 +1456,10 @@ class ParseToObjects(Transformer):
     def fstrpos(self, meta, args):
         return self.function_factory.create_function(args, FunctionType.STRPOS, meta)
 
+    @v_args(meta=True)
+    def fcontains(self, meta, args):
+        return self.function_factory.create_function(args, FunctionType.CONTAINS, meta)
+
     @v_args(meta=True)
     def fsubstring(self, meta, args):
         return self.function_factory.create_function(args, FunctionType.SUBSTRING, meta)

trilogy/parsing/trilogy.lark

@@ -3,6 +3,7 @@
     ?statement: concept
     | datasource
     | function
+    | type_declaration
     | multi_select_statement
     | select_statement
     | persist_statement
@@ -92,14 +93,15 @@
     function_binding_item: IDENTIFIER ("=" literal)?
     function_binding_list: (function_binding_item ",")* function_binding_item ","?
     raw_function: "def"  IDENTIFIER  "("  function_binding_list ")" "->" expr
-    
+
+    // TYPE blocks
+    type_declaration: "type" IDENTIFIER data_type 
+
     // user_id where state = Mexico
     _filter_alt: IDENTIFIER "?" conditional
     _filter_base: "filter"i IDENTIFIER where
     filter_item: _filter_base | _filter_alt
 
-
-
     // rank/lag/lead
     WINDOW_TYPE: ("row_number"i|"rank"i|"lag"i|"lead"i | "sum"i | "avg"i | "max"i | "min"i )  /[\s]+/
     
@@ -223,16 +225,18 @@
     alt_like: expr  "like"i expr
     _UPPER.1: "upper("i
     upper: _UPPER expr ")"
-   _LOWER.1: "lower("i
+    _LOWER.1: "lower("i
     lower: _LOWER expr ")"  
     _SPLIT.1: "split("i  
     fsplit: _SPLIT expr "," string_lit ")"
-   _STRPOS.1: "strpos("i
+    _STRPOS.1: "strpos("i
     fstrpos: _STRPOS expr "," expr ")"
+    _CONTAINS.1: "contains("i
+    fcontains: _CONTAINS expr "," expr ")"
     _SUBSTRING.1: "substring("i
     fsubstring: _SUBSTRING expr "," expr "," expr ")"
     
-    _string_functions: like | ilike | upper | lower | fsplit | fstrpos | fsubstring 
+    _string_functions: like | ilike | upper | lower | fsplit | fstrpos | fsubstring | fcontains
     
     // special aggregate
     _GROUP.1: "group("i
@@ -348,7 +352,7 @@
 
     map_type: "map"i "<" data_type "," data_type ">"
 
-    !data_type: "string"i | "number"i | "numeric"i | "map"i | "list"i | "array"i | "any"i | "int"i | "bigint"i | "date"i | "datetime"i | "timestamp"i | "float"i | "bool"i | numeric_type | map_type | struct_type | list_type
+    !data_type:  ("string"i | "number"i | "numeric"i | "map"i | "list"i | "array"i | "any"i | "int"i | "bigint"i | "date"i | "datetime"i | "timestamp"i | "float"i | "bool"i | numeric_type | map_type | struct_type | list_type) ("::" IDENTIFIER)?
     
     PURPOSE:  "key"i | "metric"i  | CONST
     PROPERTY: "property"i
@@ -361,7 +365,7 @@
     show_category: CONCEPTS | DATASOURCES
 
     show_statement: "show"i ( show_category | select_statement | persist_statement) _TERMINATOR
-   COMMENT: /#.*(\n|$)/ |  /\/\/.*\n/  
+    COMMENT: /#.*(\n|$)/ |  /\/\/.*\n/  
     %import common.WS
     %ignore WS
     %ignore COMMENT