pytrilogy 0.0.3.18__py3-none-any.whl → 0.0.3.19__py3-none-any.whl

{pytrilogy-0.0.3.18.dist-info → pytrilogy-0.0.3.19.dist-info}/METADATA

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

{pytrilogy-0.0.3.18.dist-info → pytrilogy-0.0.3.19.dist-info}/RECORD

@@ -1,4 +1,4 @@
-trilogy/__init__.py,sha256=jrbWIot3RjwpdU7heWZocVfCD4BBtWw40jekbkQLvdg,303
+trilogy/__init__.py,sha256=KxuTkRMFOlZrKTEJ94OxeHN92vhWtBys2MRzNG8uGBU,303
 trilogy/compiler.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 trilogy/constants.py,sha256=qZ1d0hoKPPV2HHCoFwPYTVB7b6bXjpWvXd3lE-zEhy8,1494
 trilogy/engine.py,sha256=OK2RuqCIUId6yZ5hfF8J1nxGP0AJqHRZiafcowmW0xc,1728
@@ -21,12 +21,12 @@ 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=u2wS2rg3Qsqb5xNRUYvjgA7jOwQS2dMZzytlwJtglBs,70859
+trilogy/core/models/author.py,sha256=gsn_vkm8gvnwTvzgqOL5v3X1Lx4n8xg32tRwk_9Mxnc,73494
 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=nb4h1HHm5_qwmUkYth4zRhEttS1EtsMZCP4vT20EEAE,10326
 trilogy/core/models/datasource.py,sha256=6RjJUd2u4nYmEwFBpJlM9LbHVYDv8iHJxqiBMZqUrwI,9422
-trilogy/core/models/environment.py,sha256=4w1a9iHdRuOuSoZxz5Kzoy61Vjj4TZVXzKkCSP6c-Ow,26298
+trilogy/core/models/environment.py,sha256=RlHNrRer4p1uSQM030iwGJL82M1hMyY5p8a550XTfUI,26606
 trilogy/core/models/execute.py,sha256=kxkw14vgUudHHELXLo73AHiaMEpLfiv0qAvbxjJxn_k,33929
 trilogy/core/optimizations/__init__.py,sha256=EBanqTXEzf1ZEYjAneIWoIcxtMDite5-n2dQ5xcfUtg,356
 trilogy/core/optimizations/base_optimization.py,sha256=gzDOKImoFn36k7XBD3ysEYDnbnb6vdVIztUfFQZsGnM,513
@@ -90,14 +90,14 @@ 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=Hodpr2QjJNHSS5xGP-wPFjKK9gpygGG6loCikyRiwH8,60287
+trilogy/parsing/parse_engine.py,sha256=AAzekSp9tcpI3lbfDoghB6zi7FkjLZIbZRSD9GLbDmU,59605
 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.18.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
-pytrilogy-0.0.3.18.dist-info/METADATA,sha256=V6EpL5Z-9Xief5rqKaourYFLzmRMZH9jM31orwdgYAk,8984
-pytrilogy-0.0.3.18.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-pytrilogy-0.0.3.18.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
-pytrilogy-0.0.3.18.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
-pytrilogy-0.0.3.18.dist-info/RECORD,,
+pytrilogy-0.0.3.19.dist-info/LICENSE.md,sha256=5ZRvtTyCCFwz1THxDTjAu3Lidds9WjPvvzgVwPSYNDo,1042
+pytrilogy-0.0.3.19.dist-info/METADATA,sha256=Gm_Cjipo1VE5HncqCyT3MNW3YLoLDAmV0P7pScqO_Ro,8984
+pytrilogy-0.0.3.19.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+pytrilogy-0.0.3.19.dist-info/entry_points.txt,sha256=0petKryjvvtEfTlbZC1AuMFumH_WQ9v8A19LvoS6G6c,54
+pytrilogy-0.0.3.19.dist-info/top_level.txt,sha256=cAy__NW_eMAa_yT9UnUNlZLFfxcg6eimUAZ184cdNiE,8
+pytrilogy-0.0.3.19.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.18"
+__version__ = "0.0.3.19"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

trilogy/core/models/author.py

@@ -318,6 +318,21 @@ class Conditional(Mergeable, ConceptArgs, Namespaced, BaseModel):
             operator=self.operator,
         )
 
+    def with_reference_replacement(self, source, target):
+        return self.__class__.model_construct(
+            left=(
+                self.left.with_reference_replacement(source, target)
+                if isinstance(self.left, Mergeable)
+                else self.left
+            ),
+            right=(
+                self.right.with_reference_replacement(source, target)
+                if isinstance(self.right, Mergeable)
+                else self.right
+            ),
+            operator=self.operator,
+        )
+
     @property
     def concept_arguments(self) -> Sequence[ConceptRef]:
         """Return concepts directly referenced in where clause"""
@@ -2135,6 +2150,52 @@ class AlignItem(Namespaced, BaseModel):
         )
 
 
+class CustomFunctionFactory:
+    def __init__(
+        self, function: Expr, namespace: str, function_arguments: list[ArgBinding]
+    ):
+        self.namespace = namespace
+        self.function = function
+        self.function_arguments = function_arguments
+
+    def with_namespace(self, namespace: str):
+        self.namespace = namespace
+        self.function = (
+            self.function.with_namespace(namespace)
+            if isinstance(self.function, Namespaced)
+            else self.function
+        )
+        self.function_arguments = [
+            x.with_namespace(namespace) for x in self.function_arguments
+        ]
+        return self
+
+    def __call__(self, *creation_args: list[Expr]):
+        nout = (
+            self.function.model_copy(deep=True)
+            if isinstance(self.function, BaseModel)
+            else self.function
+        )
+        creation_arg_list: list[Expr] = list(creation_args)
+        if len(creation_args) < len(self.function_arguments):
+            for binding in self.function_arguments[len(creation_arg_list) :]:
+                if binding.default is None:
+                    raise ValueError(f"Missing argument {binding.name}")
+                creation_arg_list.append(binding.default)
+        if isinstance(nout, Mergeable):
+            for idx, x in enumerate(creation_arg_list):
+                if self.namespace == DEFAULT_NAMESPACE:
+                    target = f"{DEFAULT_NAMESPACE}.{self.function_arguments[idx].name}"
+                else:
+                    target = self.function_arguments[idx].name
+                nout = (
+                    nout.with_reference_replacement(target, x)
+                    if isinstance(nout, Mergeable)
+                    else nout
+                )
+        return nout
+
+
 class Metadata(BaseModel):
     """Metadata container object.
     TODO: support arbitrary tags"""
@@ -2164,10 +2225,20 @@ class Comment(BaseModel):
     text: str
 
 
-class ArgBinding(BaseModel):
+class ArgBinding(Namespaced, BaseModel):
     name: str
     default: Expr | None = None
 
+    def with_namespace(self, namespace):
+        return ArgBinding(
+            name=address_with_namespace(self.name, namespace),
+            default=(
+                self.default.with_namespace(namespace)
+                if isinstance(self.default, Namespaced)
+                else self.default
+            ),
+        )
+
 
 class CustomType(BaseModel):
     name: str

trilogy/core/models/environment.py

@@ -9,7 +9,6 @@ from typing import (
     TYPE_CHECKING,
     Annotated,
     Any,
-    Callable,
     Dict,
     ItemsView,
     List,
@@ -40,6 +39,7 @@ from trilogy.core.exceptions import (
 from trilogy.core.models.author import (
     Concept,
     ConceptRef,
+    CustomFunctionFactory,
     CustomType,
     Function,
     SelectLineage,
@@ -207,7 +207,7 @@ class Environment(BaseModel):
     datasources: Annotated[
         EnvironmentDatasourceDict, PlainValidator(validate_datasources)
     ] = Field(default_factory=EnvironmentDatasourceDict)
-    functions: Dict[str, Callable[..., Any]] = Field(default_factory=dict)
+    functions: Dict[str, CustomFunctionFactory] = 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(
@@ -434,6 +434,14 @@ class Environment(BaseModel):
                 self.alias_origin_lookup[address_with_namespace(key, alias)] = (
                     val.with_namespace(alias)
                 )
+
+        for key, function in source.functions.items():
+            if same_namespace:
+                self.functions[key] = function
+            else:
+                self.functions[address_with_namespace(key, alias)] = (
+                    function.with_namespace(alias)
+                )
         return self
 
     def add_file_import(

trilogy/parsing/parse_engine.py

@@ -57,13 +57,13 @@ from trilogy.core.models.author import (
     Concept,
     ConceptRef,
     Conditional,
+    CustomFunctionFactory,
     CustomType,
     Expr,
     FilterItem,
     Function,
     Grain,
     HavingClause,
-    Mergeable,
     Metadata,
     OrderBy,
     OrderItem,
@@ -1198,23 +1198,11 @@ class ParseToObjects(Transformer):
         function_arguments: list[ArgBinding] = args[1]
         output = args[2]
 
-        def function_factory(*creation_args: list[Expr]):
-            nout = output.copy(deep=True)
-            creation_arg_list: list[Expr] = list(creation_args)
-            if len(creation_args) < len(function_arguments):
-                for binding in function_arguments[len(creation_arg_list) :]:
-                    if binding.default is None:
-                        raise ValueError(f"Missing argument {binding.name}")
-                    creation_arg_list.append(binding.default)
-            if isinstance(nout, Mergeable):
-                for idx, x in enumerate(creation_arg_list):
-                    # these will always be local namespace
-                    nout = nout.with_reference_replacement(
-                        f"{DEFAULT_NAMESPACE}.{function_arguments[idx].name}", x
-                    )
-            return nout
-
-        self.environment.functions[identity] = function_factory
+        self.environment.functions[identity] = CustomFunctionFactory(
+            function=output,
+            namespace=self.environment.namespace,
+            function_arguments=function_arguments,
+        )
         return FunctionDeclaration(name=identity, args=function_arguments, expr=output)
 
     def custom_function(self, args):