pytrilogy 0.0.3.28__py3-none-any.whl → 0.0.3.30__py3-none-any.whl

{pytrilogy-0.0.3.28.dist-info → pytrilogy-0.0.3.30.dist-info}/METADATA

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

{pytrilogy-0.0.3.28.dist-info → pytrilogy-0.0.3.30.dist-info}/RECORD

@@ -1,5 +1,5 @@
-pytrilogy-0.0.3.28.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-trilogy/__init__.py,sha256=BWRnSblH31X0EL041UhPaq_TRiA9hEJGt6VMVN-XBsg,303
+pytrilogy-0.0.3.30.dist-info/licenses/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+trilogy/__init__.py,sha256=N2ia8yWHecF0aH0-BYA1rcIjOwSIhR5Igw8b5lKDinc,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=5eQxk1A0pv-TQk3CCvgZCFA9_K-6nxrOm7E5Lxd7KIY,1652
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -11,19 +11,19 @@ trilogy/utility.py,sha256=euQccZLKoYBz0LNg5tzLlvv2YHvXh9HArnYp1V3uXsM,763
 trilogy/authoring/__init__.py,sha256=ohkYA3_LGYZh3fwzEYKTN6ofACDI5GYl3VCbGxVvlzY,2233
 trilogy/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/core/constants.py,sha256=7XaCpZn5mQmjTobbeBn56SzPWq9eMNDfzfsRU-fP0VE,171
-trilogy/core/enums.py,sha256=zpXhm8qk6i_ih4O6ro5sPMbIQSQDtzLcBcX5eKWQZU4,7197
+trilogy/core/enums.py,sha256=jepT1QpOvLbz6HNWvAoEyxvaMPLRbaOkIWjOkwJ15uo,7215
 trilogy/core/env_processor.py,sha256=pFsxnluKIusGKx1z7tTnfsd_xZcPy9pZDungkjkyvI0,3170
 trilogy/core/environment_helpers.py,sha256=i0oyxfLjFQW6ZbD6g2wa0DXUoEvd2sHG28TZ1UBs2os,7573
 trilogy/core/ergonomics.py,sha256=e-7gE29vPLFdg0_A1smQ7eOrUwKl5VYdxRSTddHweRA,1631
 trilogy/core/exceptions.py,sha256=JPYyBcit3T_pRtlHdtKSeVJkIyWUTozW2aaut25A2xI,673
-trilogy/core/functions.py,sha256=Ke8-d2RtHZszAQdx_6dNyHtELbvMIGZo2CsglxqtvEQ,26890
+trilogy/core/functions.py,sha256=z5uyC5sAS_vnFBJcky7TjA0QAy-xI4Z9uD_9vK_XP1s,27134
 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=-90COW7QY6w-g8GkjivPZqG2yNitn74e13m5KYgB1IU,73985
-trilogy/core/models/build.py,sha256=tky6ryVPcAECt53Sk9TGzmGCumxdbfY9Uxn0oVi50VA,57854
+trilogy/core/models/author.py,sha256=2lkuKm6FKEMoYx6h03g7WhCTCooT5sCbKJmlVfAlMG8,75876
+trilogy/core/models/build.py,sha256=3_n6qxoMuzX3Ahu9HLfoyPbtH0Wb--6crZNwCnZhu7k,58104
 trilogy/core/models/build_environment.py,sha256=8UggvlPU708GZWYPJMc_ou2r7M3TY2g69eqGvz03YX0,5528
 trilogy/core/models/core.py,sha256=wx6hJcFECMG-Ij972ADNkr-3nFXkYESr82ObPiC46_U,10875
 trilogy/core/models/datasource.py,sha256=6RjJUd2u4nYmEwFBpJlM9LbHVYDv8iHJxqiBMZqUrwI,9422
@@ -65,12 +65,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=JXJ0iVRlSEM2IBr1TANym2RaUf_p5E_l2sNykRzXWDo,1710
 trilogy/core/statements/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-trilogy/core/statements/author.py,sha256=sPrItQEKXzE7IR3SGOTVN4OBvGHldUCqXCzbcmEpb7I,14575
+trilogy/core/statements/author.py,sha256=75ZIMOfQFAahtVLpv3qYJre2SAIdf0vrGBsTR5qweDg,14638
 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=ogBNUDt0UEmx-F8EXGG65i6fcz2KcIz8a3gwE7YXCVw,40956
+trilogy/dialect/base.py,sha256=lm3rUjmGENoW9wyXAzzJmBohXLVv4sLvvtfB-YCeHPY,41006
 trilogy/dialect/bigquery.py,sha256=PkjFcNGZHYOe655PmJhb8a0afdFULuovqP0qQVO8m0I,2953
 trilogy/dialect/common.py,sha256=XjHkP8Dqezjkd2JU5xoAlMRS_6HNyXQCF4CykLK3C8o,5011
 trilogy/dialect/config.py,sha256=olnyeVU5W5T6b9-dMeNAnvxuPlyc2uefb7FRME094Ec,3834
@@ -87,22 +87,22 @@ 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=JN8pPjtoEMyURAtp7fttm-8iFkaAvuinUKyQs05FqoM,21615
+trilogy/parsing/common.py,sha256=_61lUd6DONwteY_D6lanZZgi2NoEWivAxJtrOYrmw34,21915
 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=Ffm3YB2jTPcA81CZTkpQ7iAwD1LP10QQpjoKk9fey4I,61849
-trilogy/parsing/render.py,sha256=o_XuQWhcwx1lD9eGVqkqZEwkmQK0HdmWWokGBtdeH4I,17837
-trilogy/parsing/trilogy.lark,sha256=GYRO0LJYUtzf1__d2b0L2EJzRGfnsI2SaQHzh9RgxnA,12945
+trilogy/parsing/parse_engine.py,sha256=wkHQ7FrFLV0508I88qJk7nfqNZCpzclLYHlJcguDwQE,62220
+trilogy/parsing/render.py,sha256=ElpmCWUhGs8h489S7cdlbI8bilJlnBgHZ8KMR8y1FrM,18840
+trilogy/parsing/trilogy.lark,sha256=h7mJiad7GgTTXnrjntE6OF7xpND5TQlvHqZFfx0nkyk,12993
 trilogy/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/scripts/trilogy.py,sha256=1L0XrH4mVHRt1C9T1HnaDv2_kYEfbWTb5_-cBBke79w,3774
 trilogy/std/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/std/dashboard.preql,sha256=eJJTs3xPjYKmp-U5SUxCXAAbp55NlmmC3kECaNg4ya4,128
 trilogy/std/date.preql,sha256=0MHeGLp2mG4QBKtmozcBZ7qVjOAdWOtrliIKn6hz1Pc,95
-trilogy/std/geography.preql,sha256=KavDw4wbTJcgooo30vWF-MYg5WvD7dZYIWuBQtSaPxg,441
+trilogy/std/geography.preql,sha256=-fqAGnBL6tR-UtT8DbSek3iMFg66ECR_B_41pODxv-k,504
 trilogy/std/money.preql,sha256=ZHW-csTX-kYbOLmKSO-TcGGgQ-_DMrUXy0BjfuJSFxM,80
-pytrilogy-0.0.3.28.dist-info/METADATA,sha256=yyfDxvVnQCKioM0j6JT07GLQpwwRAtwFwPukuUz6HsI,9100
-pytrilogy-0.0.3.28.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-pytrilogy-0.0.3.28.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
-pytrilogy-0.0.3.28.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.28.dist-info/RECORD,,
+pytrilogy-0.0.3.30.dist-info/METADATA,sha256=we5JHKvw-U_4BLL35Nzk6KBi_GiiPP3FsL89wzy0B94,9100
+pytrilogy-0.0.3.30.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+pytrilogy-0.0.3.30.dist-info/entry_points.txt,sha256=ewBPU2vLnVexZVnB-NrVj-p3E-4vukg83Zk8A55Wp2w,56
+pytrilogy-0.0.3.30.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.30.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.28"
+__version__ = "0.0.3.30"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/enums.py

@@ -153,6 +153,7 @@ class FunctionType(Enum):
     MOD = "mod"
     ROUND = "round"
     ABS = "abs"
+    SQRT = "sqrt"
 
     # Aggregates
     ## group is not a real aggregate - it just means group by this + some other set of fields

trilogy/core/functions.py

@@ -607,7 +607,15 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         ],
         output_purpose=Purpose.PROPERTY,
         output_type=DataType.INTEGER,
-        arg_count=InfiniteFunctionArgs,
+        arg_count=2,
+    ),
+    FunctionType.SQRT: FunctionConfig(
+        valid_inputs=[
+            {DataType.INTEGER, DataType.FLOAT, DataType.NUMBER, DataType.NUMERIC},
+        ],
+        output_purpose=Purpose.PROPERTY,
+        output_type=DataType.INTEGER,
+        arg_count=1,
     ),
     FunctionType.ROUND: FunctionConfig(
         valid_inputs=[

trilogy/core/models/author.py

@@ -376,7 +376,7 @@ class Conditional(Mergeable, ConceptArgs, Namespaced, DataTyped, BaseModel):
 
 
 class WhereClause(Mergeable, ConceptArgs, Namespaced, BaseModel):
-    conditional: Union[SubselectComparison, Comparison, Conditional, "Parenthetical"]
+    conditional: Union[SubselectComparison, Comparison, Conditional, Parenthetical]
 
     def __repr__(self):
         return str(self.conditional)
@@ -564,6 +564,7 @@ class Comparison(ConceptArgs, Mergeable, DataTyped, Namespaced, BaseModel):
         "Conditional",
         DataType,
         "Comparison",
+        FunctionCallWrapper,
         "Parenthetical",
         MagicConstants,
         WindowItem,
@@ -583,6 +584,7 @@ class Comparison(ConceptArgs, Mergeable, DataTyped, Namespaced, BaseModel):
         Conditional,
         DataType,
         Comparison,
+        FunctionCallWrapper,
         Parenthetical,
         MagicConstants,
         WindowItem,
@@ -1622,7 +1624,6 @@ class Function(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
         elif not valid_inputs:
             return v
         for idx, arg in enumerate(v):
-
             if (
                 isinstance(arg, ConceptRef)
                 and get_basic_type(arg.datatype.data_type) not in valid_inputs[idx]
@@ -1753,6 +1754,69 @@ class Function(DataTyped, ConceptArgs, Mergeable, Namespaced, BaseModel):
         return base_grain
 
 
+class FunctionCallWrapper(
+    DataTyped,
+    ConceptArgs,
+    Mergeable,
+    Namespaced,
+    BaseModel,
+):
+    content: Expr
+    name: str
+    args: List[Expr]
+
+    def __str__(self):
+        return f'@{self.name}({",".join([str(x) for x in self.args])})'
+
+    def with_namespace(self, namespace) -> "FunctionCallWrapper":
+        return FunctionCallWrapper.model_construct(
+            content=(
+                self.content.with_namespace(namespace)
+                if isinstance(self.content, Namespaced)
+                else self.content
+            ),
+            name=self.name,
+            args=[
+                x.with_namespace(namespace) if isinstance(x, Namespaced) else x
+                for x in self.args
+            ],
+        )
+
+    def with_merge(
+        self, source: Concept, target: Concept, modifiers: List[Modifier]
+    ) -> "FunctionCallWrapper":
+        return FunctionCallWrapper.model_construct(
+            content=(
+                self.content.with_merge(source, target, modifiers)
+                if isinstance(self.content, Mergeable)
+                else self.content
+            ),
+            name=self.name,
+            args=[
+                (
+                    x.with_merge(source, target, modifiers)
+                    if isinstance(x, Mergeable)
+                    else x
+                )
+                for x in self.args
+            ],
+        )
+
+    @property
+    def concept_arguments(self) -> Sequence[ConceptRef]:
+        base: List[ConceptRef] = []
+        x = self.content
+        if isinstance(x, ConceptRef):
+            base += [x]
+        elif isinstance(x, ConceptArgs):
+            base += x.concept_arguments
+        return base
+
+    @property
+    def output_datatype(self):
+        return arg_to_datatype(self.content)
+
+
 class AggregateWrapper(Mergeable, DataTyped, ConceptArgs, Namespaced, BaseModel):
     function: Function
     by: List[ConceptRef] = Field(default_factory=list)
@@ -2278,6 +2342,7 @@ Expr = (
     | ConceptRef
     | Comparison
     | Conditional
+    | FunctionCallWrapper
     | Parenthetical
     | Function
     | AggregateWrapper
@@ -2289,6 +2354,7 @@ FuncArgs = (
     ConceptRef
     | AggregateWrapper
     | Function
+    | FunctionCallWrapper
     | Parenthetical
     | CaseWhen
     | CaseElse

trilogy/core/models/build.py

@@ -53,6 +53,7 @@ from trilogy.core.models.author import (
     FilterItem,
     FuncArgs,
     Function,
+    FunctionCallWrapper,
     Grain,
     HavingClause,
     Metadata,
@@ -1608,6 +1609,12 @@ class Factory:
     def _(self, base: OrderBy) -> BuildOrderBy:
         return BuildOrderBy.model_construct(items=[self.build(x) for x in base.items])
 
+    @build.register
+    def _(self, base: FunctionCallWrapper) -> BuildExpr:
+        # function calls are kept around purely for the parse tree
+        # so discard at the build point
+        return self.build(base.content)
+
     @build.register
     def _(self, base: OrderItem) -> BuildOrderItem:
         from trilogy.parsing.common import arbitrary_to_concept

trilogy/core/statements/author.py

@@ -22,6 +22,7 @@ from trilogy.core.models.author import (
     Expr,
     FilterItem,
     Function,
+    FunctionCallWrapper,
     Grain,
     HasUUID,
     HavingClause,
@@ -44,7 +45,9 @@ from trilogy.utility import unique
 
 
 class ConceptTransform(BaseModel):
-    function: Function | FilterItem | WindowItem | AggregateWrapper
+    function: (
+        Function | FilterItem | WindowItem | AggregateWrapper | FunctionCallWrapper
+    )
     output: Concept  # this has to be a full concept, as it may not exist in environment
     modifiers: List[Modifier] = Field(default_factory=list)
 

trilogy/dialect/base.py

@@ -171,6 +171,7 @@ FUNCTION_MAP = {
     FunctionType.MULTIPLY: lambda x: " * ".join(x),
     FunctionType.ROUND: lambda x: f"round({x[0]},{x[1]})",
     FunctionType.MOD: lambda x: f"({x[0]} % {x[1]})",
+    FunctionType.SQRT: lambda x: f"sqrt({x[0]})",
     # aggregate types
     FunctionType.COUNT_DISTINCT: lambda x: f"count(distinct {x[0]})",
     FunctionType.COUNT: lambda x: f"count({x[0]})",

trilogy/parsing/common.py

@@ -27,6 +27,7 @@ from trilogy.core.models.author import (
     ConceptRef,
     FilterItem,
     Function,
+    FunctionCallWrapper,
     Grain,
     HavingClause,
     ListWrapper,
@@ -595,6 +596,7 @@ def rowset_to_concepts(rowset: RowsetDerivationStatement, environment: Environme
 def arbitrary_to_concept(
     parent: (
         AggregateWrapper
+        | FunctionCallWrapper
         | WindowItem
         | FilterItem
         | Function
@@ -610,7 +612,12 @@ def arbitrary_to_concept(
     metadata: Metadata | None = None,
 ) -> Concept:
     namespace = namespace or environment.namespace
-    if isinstance(parent, AggregateWrapper):
+    # this is purely for the parse tree, discard from derivation
+    if isinstance(parent, FunctionCallWrapper):
+        return arbitrary_to_concept(
+            parent.content, environment, namespace, name, metadata  # type: ignore
+        )
+    elif isinstance(parent, AggregateWrapper):
         if not name:
             name = f"{VIRTUAL_CONCEPT_PREFIX}_agg_{parent.function.operator.value}_{string_to_hash(str(parent))}"
         return agg_wrapper_to_concept(

trilogy/parsing/parse_engine.py

@@ -64,6 +64,7 @@ from trilogy.core.models.author import (
     Expr,
     FilterItem,
     Function,
+    FunctionCallWrapper,
     Grain,
     HavingClause,
     Metadata,
@@ -202,7 +203,7 @@ def expr_to_boolean(
 def unwrap_transformation(
     input: Expr,
     environment: Environment,
-) -> Function | FilterItem | WindowItem | AggregateWrapper:
+) -> Function | FilterItem | WindowItem | AggregateWrapper | FunctionCallWrapper:
     if isinstance(input, Function):
         return input
     elif isinstance(input, AggregateWrapper):
@@ -219,6 +220,8 @@ def unwrap_transformation(
         return input
     elif isinstance(input, WindowItem):
         return input
+    elif isinstance(input, FunctionCallWrapper):
+        return input
     elif isinstance(input, Parenthetical):
         return unwrap_transformation(input.content, environment)
     else:
@@ -810,7 +813,6 @@ class ParseToObjects(Transformer):
         )
 
         metadata = Metadata(line_number=meta.line, concept_source=ConceptSource.SELECT)
-
         concept = arbitrary_to_concept(
             transformation,
             environment=self.environment,
@@ -1248,10 +1250,12 @@ class ParseToObjects(Transformer):
         )
         return FunctionDeclaration(name=identity, args=function_arguments, expr=output)
 
-    def custom_function(self, args):
+    def custom_function(self, args) -> FunctionCallWrapper:
         name = args[0]
         args = args[1:]
-        remapped = self.environment.functions[name](*args)
+        remapped = FunctionCallWrapper(
+            content=self.environment.functions[name](*args), name=name, args=args
+        )
         return remapped
 
     @v_args(meta=True)
@@ -1723,6 +1727,10 @@ class ParseToObjects(Transformer):
     def fmod(self, meta: Meta, args) -> Function:
         return self.function_factory.create_function(args, FunctionType.MOD, meta)
 
+    @v_args(meta=True)
+    def fsqrt(self, meta: Meta, args) -> Function:
+        return self.function_factory.create_function(args, FunctionType.SQRT, meta)
+
     @v_args(meta=True)
     def fround(self, meta, args) -> Function:
         return self.function_factory.create_function(args, FunctionType.ROUND, meta)

trilogy/parsing/render.py

@@ -18,6 +18,7 @@ from trilogy.core.models.author import (
     Conditional,
     FilterItem,
     Function,
+    FunctionCallWrapper,
     Grain,
     OrderBy,
     OrderItem,
@@ -31,6 +32,7 @@ from trilogy.core.models.core import (
     ListType,
     ListWrapper,
     NumericType,
+    TraitDataType,
     TupleWrapper,
 )
 from trilogy.core.models.datasource import (
@@ -42,10 +44,12 @@ from trilogy.core.models.datasource import (
 )
 from trilogy.core.models.environment import Environment, Import
 from trilogy.core.statements.author import (
+    ArgBinding,
     ConceptDeclarationStatement,
     ConceptDerivationStatement,
     ConceptTransform,
     CopyStatement,
+    FunctionDeclaration,
     ImportStatement,
     MergeStatementV2,
     MultiSelectStatement,
@@ -54,6 +58,7 @@ from trilogy.core.statements.author import (
     RowsetDerivationStatement,
     SelectItem,
     SelectStatement,
+    TypeDeclaration,
 )
 
 QUERY_TEMPLATE = Template(
@@ -149,6 +154,21 @@ class Renderer:
         final = "\n\n".join("\n".join(x) for x in components)
         return final
 
+    @to_string.register
+    def _(self, arg: TypeDeclaration):
+        return f"type {arg.type.name} {self.to_string(arg.type.type)};"
+
+    @to_string.register
+    def _(self, arg: ArgBinding):
+        if arg.default:
+            return f"{arg.name}={self.to_string(arg.default)}"
+        return f"{arg.name}"
+
+    @to_string.register
+    def _(self, arg: FunctionDeclaration):
+        args = ", ".join([self.to_string(x) for x in arg.args])
+        return f"def {arg.name}({args}) -> {self.to_string(arg.expr)};"
+
     @to_string.register
     def _(self, arg: Datasource):
         assignments = ",\n    ".join([self.to_string(x) for x in arg.columns])
@@ -198,6 +218,12 @@ class Renderer:
     def _(self, arg: "CaseElse"):
         return f"""ELSE {self.to_string(arg.expr)}"""
 
+    @to_string.register
+    def _(self, arg: "FunctionCallWrapper"):
+        args = [self.to_string(c) for c in arg.args]
+        arg_string = ", ".join(args)
+        return f"""@{arg.name}({arg_string})"""
+
     @to_string.register
     def _(self, arg: "Parenthetical"):
         return f"""({self.to_string(arg.content)})"""
@@ -210,6 +236,11 @@ class Renderer:
     def _(self, arg: "NumericType"):
         return f"""Numeric({arg.precision},{arg.scale})"""
 
+    @to_string.register
+    def _(self, arg: TraitDataType):
+        traits = "::".join([x for x in arg.traits])
+        return f"{self.to_string(arg.data_type)}::{traits}"
+
     @to_string.register
     def _(self, arg: ListWrapper):
         return "[" + ", ".join([self.to_string(x) for x in arg]) + "]"

trilogy/parsing/trilogy.lark

@@ -180,6 +180,7 @@
     map_key_access: expr "[" string_lit "]"
     attr_access: expr  "." string_lit 
 
+
     expr:  _constant_functions | window_item | filter_item | subselect_comparison | between_comparison |  fgroup |  aggregate_functions | unnest | union | _static_functions |  literal |  concept_lit  | index_access |  map_key_access | attr_access | parenthetical | expr_tuple | comparison |  alt_like | custom_function 
     
     // functions
@@ -191,8 +192,9 @@
     fmod: ( "mod"i "(" expr "," (int_lit | concept_lit ) ")") | ( expr "%" (int_lit | concept_lit ) )
     fround: "round"i "(" expr "," expr ")"
     fabs: "abs"i "(" expr ")"
+    fsqrt: "sqrt"i "(" expr ")"
         
-    _math_functions: fmul | fdiv | fadd | fsub | fround | fmod | fabs
+    _math_functions: fmul | fdiv | fadd | fsub | fround | fmod | fabs | fsqrt
     
     //generic
     _fcast_primary: "cast"i "(" expr "as"i data_type ")"
@@ -306,7 +308,7 @@
     custom_function:  "@" IDENTIFIER  "(" (expr ",")* expr ")"
 
     // base language constructs
-    concept_lit: IDENTIFIER
+    concept_lit: MINUS? IDENTIFIER
     IDENTIFIER: /[a-zA-Z\_][a-zA-Z0-9\_\.]*/
     WILDCARD_IDENTIFIER: /[a-zA-Z\_][a-zA-Z0-9\_\-\.\*]*/
     QUOTED_IDENTIFIER:  /`[a-zA-Z\_][a-zA-Z0-9\_\.\-\*\:\s]*`/

trilogy/std/geography.preql

@@ -1,10 +1,10 @@
 
 
 ## us types
-type us_state string; # US state abbreviation
-type us_zip_code string; # US ZIP code
-type us_state string; # US state name
+type us_state_short string; # US state abbreviation - ex MA, CA, NY
+type us_state string; # US state name - ex Massachusetts, California, New York
 
+type us_zip_code string; # US ZIP code
 
 ## generic types
 type latitude float; # Latitude in degrees