pytrilogy 0.0.3.28__tar.gz → 0.0.3.30__tar.gz

{pytrilogy-0.0.3.28/pytrilogy.egg-info → pytrilogy-0.0.3.30}/PKG-INFO

@@ -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 → pytrilogy-0.0.3.30/pytrilogy.egg-info}/PKG-INFO

@@ -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 → pytrilogy-0.0.3.30}/tests/test_user_functions.py

@@ -1,4 +1,6 @@
-from trilogy import Dialects
+from pathlib import Path
+
+from trilogy import Dialects, Environment
 from trilogy.core.enums import Derivation, Purpose
 
 
@@ -204,3 +206,25 @@ auto test <-SUM(CASE WHEN 10 = weekday THEN x ELSE 0 END) +
     assert test.keys == set()
     assert test.purpose == Purpose.METRIC
     assert test.derivation == Derivation.BASIC
+
+
+def test_user_function_import():
+    env = Environment(working_path=Path(__file__).parent)
+    x = Dialects.DUCK_DB.default_executor(environment=env)
+
+    results = x.execute_query(
+        """
+import test_env_functions as test_env_functions;
+
+key x int;
+
+merge test_env_functions.quad_test into x;
+
+select 
+    x as quad_test,
+    @test_env_functions.quadratic(2, 3, 4) as quad_two;
+
+"""
+    )
+    results = results.fetchall()
+    assert results[0].quad_test == 16.414213562373096

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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"]

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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=[

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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)
 

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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]})",

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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(

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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)

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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]) + "]"

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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]*`/

{pytrilogy-0.0.3.28 → pytrilogy-0.0.3.30}/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