pytrilogy 0.0.3.17__tar.gz → 0.0.3.19__tar.gz

{pytrilogy-0.0.3.17/pytrilogy.egg-info → pytrilogy-0.0.3.19}/PKG-INFO

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

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/tests/test_show.py

@@ -52,6 +52,6 @@ def test_show_bigquery():
         .execute_query(select)
         .fetchall()
     )
-    assert "FULL JOIN wakeful on 1=1" in query[0]["__preql_internal_query_text"], query[
-        0
-    ]["__preql_internal_query_text"]
+    assert (
+        "FULL JOIN cheerful on 1=1" in query[0]["__preql_internal_query_text"]
+    ), query[0]["__preql_internal_query_text"]

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/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.17"
+__version__ = "0.0.3.19"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/trilogy/core/enums.py

@@ -193,6 +193,7 @@ class FunctionType(Enum):
     DATE_PART = "date_part"
     DATE_TRUNCATE = "date_truncate"
     DATE_ADD = "date_add"
+    DATE_SUB = "date_sub"
     DATE_DIFF = "date_diff"
 
     # UNIX

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/trilogy/core/ergonomics.py

@@ -3,7 +3,6 @@ from trilogy.constants import CONFIG
 # source: https://github.com/aaronbassett/Pass-phrase
 CTE_NAMES = """quizzical
 highfalutin
-dynamic
 wakeful
 cheerful
 thoughtful

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/trilogy/core/functions.py

@@ -145,6 +145,9 @@ def get_date_trunc_output(
 
 
 FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
+    FunctionType.ALIAS: FunctionConfig(
+        arg_count=1,
+    ),
     FunctionType.PARENTHETICAL: FunctionConfig(
         arg_count=1,
     ),
@@ -375,6 +378,21 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
         output_type=DataType.DATE,
         arg_count=3,
     ),
+    FunctionType.DATE_SUB: FunctionConfig(
+        valid_inputs=[
+            {
+                DataType.DATE,
+                DataType.TIMESTAMP,
+                DataType.DATETIME,
+                DataType.STRING,
+            },
+            {DataType.DATE_PART},
+            {DataType.INTEGER},
+        ],
+        output_purpose=Purpose.PROPERTY,
+        output_type=DataType.DATE,
+        arg_count=3,
+    ),
     FunctionType.DATE_DIFF: FunctionConfig(
         valid_inputs=[
             {
@@ -639,8 +657,6 @@ FUNCTION_REGISTRY: dict[FunctionType, FunctionConfig] = {
 
 EXCLUDED_FUNCTIONS = {
     FunctionType.CUSTOM,
-    FunctionType.ALIAS,
-    # FunctionType.PARENTHETICAL,
     # Temporary
     FunctionType.DATE_LITERAL,
     FunctionType.DATETIME_LITERAL,
@@ -649,7 +665,9 @@ EXCLUDED_FUNCTIONS = {
 
 for k in FunctionType.__members__.values():
     if k not in FUNCTION_REGISTRY and k not in EXCLUDED_FUNCTIONS:
-        raise InvalidSyntaxException(f"Function {k} not in registry")
+        raise InvalidSyntaxException(
+            f"Function enum value {k} not in creation registry"
+        )
 
 
 class FunctionFactory:

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/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"""
@@ -793,6 +808,10 @@ class Concept(Addressable, DataTyped, ConceptArgs, Mergeable, Namespaced, BaseMo
         base = f"{self.address}@{self.grain}"
         return base
 
+    @property
+    def is_internal(self) -> bool:
+        return self.namespace.startswith("_") or self.name.startswith("_")
+
     @property
     def reference(self) -> ConceptRef:
         return ConceptRef.model_construct(
@@ -2131,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"""
@@ -2160,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

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/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,
@@ -58,6 +58,7 @@ if TYPE_CHECKING:
 class Import:
     alias: str
     path: Path
+    input_path: str | None = None
 
 
 class BaseImportResolver(BaseModel):
@@ -206,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(
@@ -433,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(

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/trilogy/core/statements/author.py

@@ -382,7 +382,12 @@ class MergeStatementV2(HasUUID, BaseModel):
 
 
 class ImportStatement(HasUUID, BaseModel):
+    # import abc.def as bar
+    # the bit after 'as', eg bar
     alias: str
+    # the bit after import, abc.def
+    input_path: str
+    # what it actually resolves to, typically a filepath
     path: Path
 
 

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/trilogy/dialect/duckdb.py

@@ -8,6 +8,7 @@ from trilogy.dialect.base import BaseDialect
 
 WINDOW_FUNCTION_MAP: Mapping[WindowType, Callable[[Any, Any, Any], str]] = {}
 
+
 FUNCTION_MAP = {
     FunctionType.COUNT: lambda args: f"count({args[0]})",
     FunctionType.SUM: lambda args: f"sum({args[0]})",
@@ -27,7 +28,7 @@ FUNCTION_MAP = {
     # datetime is aliased
     FunctionType.CURRENT_DATETIME: lambda x: "cast(get_current_timestamp() as datetime)",
     FunctionType.DATE_TRUNCATE: lambda x: f"date_trunc('{x[1]}', {x[0]})",
-    FunctionType.DATE_ADD: lambda x: f"date_add({x[0]}, INTERVAL {x[2]} {x[1]})",
+    FunctionType.DATE_ADD: lambda x: f"date_add({x[0]}, {x[2]} * INTERVAL 1 {x[1]})",
     FunctionType.DATE_PART: lambda x: f"date_part('{x[1]}', {x[0]})",
     FunctionType.DATE_DIFF: lambda x: f"date_diff('{x[2]}', {x[0]}, {x[1]})",
     FunctionType.CONCAT: lambda x: f"({' || '.join(x)})",

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/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,
@@ -951,7 +951,8 @@ class ParseToObjects(Transformer):
         else:
             alias = self.environment.namespace
             cache_key = args[0]
-        path = args[0].split(".")
+        input_path = args[0]
+        path = input_path.split(".")
 
         if isinstance(
             self.environment.config.import_resolver, FileSystemImportResolver
@@ -971,7 +972,9 @@ class ParseToObjects(Transformer):
 
         # we don't iterate past the max parse depth
         if len(key_path) > MAX_PARSE_DEPTH:
-            return ImportStatement(alias=alias, path=Path(target))
+            return ImportStatement(
+                alias=alias, input_path=input_path, path=Path(target)
+            )
 
         if token_lookup in self.tokens:
             raw_tokens = self.tokens[token_lookup]
@@ -1015,7 +1018,7 @@ class ParseToObjects(Transformer):
                 ) from e
 
         parsed_path = Path(args[0])
-        imps = ImportStatement(alias=alias, path=parsed_path)
+        imps = ImportStatement(alias=alias, input_path=input_path, path=parsed_path)
 
         self.environment.add_import(
             alias, new_env, Import(alias=alias, path=parsed_path)
@@ -1195,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):
@@ -1582,6 +1573,10 @@ class ParseToObjects(Transformer):
     def fdate_add(self, meta, args):
         return self.function_factory.create_function(args, FunctionType.DATE_ADD, meta)
 
+    @v_args(meta=True)
+    def fdate_sub(self, meta, args):
+        return self.function_factory.create_function(args, FunctionType.DATE_SUB, meta)
+
     @v_args(meta=True)
     def fdate_diff(self, meta, args):
         return self.function_factory.create_function(args, FunctionType.DATE_DIFF, meta)

{pytrilogy-0.0.3.17 → pytrilogy-0.0.3.19}/trilogy/parsing/trilogy.lark

@@ -293,11 +293,13 @@
     _DATE_PART.1: "date_part("i
     fdate_part: _DATE_PART expr "," DATE_PART ")"
     _DATE_ADD.1: "date_add("i
-    fdate_add: _DATE_ADD expr "," DATE_PART "," int_lit ")"
-   _DATE_DIFF.1: "date_diff("i
+    fdate_add: _DATE_ADD expr "," DATE_PART "," expr ")"
+    _DATE_SUB.1: "date_sub("i
+    fdate_sub: _DATE_SUB expr "," DATE_PART "," expr ")"
+    _DATE_DIFF.1: "date_diff("i
     fdate_diff: _DATE_DIFF expr "," expr "," DATE_PART ")"
     
-    _date_functions: fdate | fdate_add | fdate_diff | fdatetime | ftimestamp | fsecond | fminute | fhour | fday | fday_of_week | fweek | fmonth | fquarter | fyear | fdate_part | fdate_trunc
+    _date_functions: fdate | fdate_add | fdate_sub | fdate_diff | fdatetime | ftimestamp | fsecond | fminute | fhour | fday | fday_of_week | fweek | fmonth | fquarter | fyear | fdate_part | fdate_trunc
     
     _static_functions:  _string_functions | _math_functions | _generic_functions |  _date_functions