pytrilogy 0.0.3.18__tar.gz → 0.0.3.20__tar.gz

{pytrilogy-0.0.3.18/pytrilogy.egg-info → pytrilogy-0.0.3.20}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pytrilogy
-Version: 0.0.3.18
+Version: 0.0.3.20
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -44,7 +44,7 @@ pytrilogy is an experimental implementation of the Trilogy language, a higher-le
 Trilogy looks like SQL, but simpler. It's a modern SQL refresh targeted at SQL lovers who want more reusability and composability without losing the expressiveness and iterative value of SQL. It compiles to SQL - making it easy to debug or integrate into existing workflows - and can be run against any supported SQL backend.  
 
 > [!TIP]
-> To get an overview of the language and run interactive examples, head to the [documentation](https://trilogydata.dev/).
+> Try it online in a hosted [open-source studio](https://trilogydata.dev/trilogy-studio-core/). To get an overview of the language and run interactive examples, head to the [documentation](https://trilogydata.dev/).
 
 Installation: `pip install pytrilogy`
 

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/README.md

@@ -7,7 +7,7 @@ pytrilogy is an experimental implementation of the Trilogy language, a higher-le
 Trilogy looks like SQL, but simpler. It's a modern SQL refresh targeted at SQL lovers who want more reusability and composability without losing the expressiveness and iterative value of SQL. It compiles to SQL - making it easy to debug or integrate into existing workflows - and can be run against any supported SQL backend.  
 
 > [!TIP]
-> To get an overview of the language and run interactive examples, head to the [documentation](https://trilogydata.dev/).
+> Try it online in a hosted [open-source studio](https://trilogydata.dev/trilogy-studio-core/). To get an overview of the language and run interactive examples, head to the [documentation](https://trilogydata.dev/).
 
 Installation: `pip install pytrilogy`
 
@@ -353,4 +353,4 @@ Return generated SQL without executing.
 
 ```sql
 show <select>;
-```
+```

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: pytrilogy
-Version: 0.0.3.18
+Version: 0.0.3.20
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -44,7 +44,7 @@ pytrilogy is an experimental implementation of the Trilogy language, a higher-le
 Trilogy looks like SQL, but simpler. It's a modern SQL refresh targeted at SQL lovers who want more reusability and composability without losing the expressiveness and iterative value of SQL. It compiles to SQL - making it easy to debug or integrate into existing workflows - and can be run against any supported SQL backend.  
 
 > [!TIP]
-> To get an overview of the language and run interactive examples, head to the [documentation](https://trilogydata.dev/).
+> Try it online in a hosted [open-source studio](https://trilogydata.dev/trilogy-studio-core/). To get an overview of the language and run interactive examples, head to the [documentation](https://trilogydata.dev/).
 
 Installation: `pip install pytrilogy`
 

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/tests/test_parsing.py

@@ -1,3 +1,5 @@
+from pytest import raises
+
 from trilogy import Dialects
 from trilogy.constants import MagicConstants
 from trilogy.core.enums import BooleanOperator, ComparisonOperator, Purpose
@@ -661,3 +663,44 @@ select x % 10 -> x_mod_10;
             
 """
     )
+
+
+def test_import_shows_source():
+
+    env = Environment(
+        config=EnvironmentOptions(
+            import_resolver=DictImportResolver(
+                content={
+                    "test": """
+import test_dep as test_dep;
+key x int;
+datasource test (
+x: x)
+grain(x)
+query '''
+select 1 as x
+union all
+select 11 as x
+''' TYPO
+""",
+                    "test_dep": """
+key x int;
+""",
+                }
+            )
+        )
+    )
+    assert isinstance(env.config.import_resolver, DictImportResolver)
+
+    with raises(Exception, match="Unable to import 'test', parsing error") as e:
+        env.parse(
+            """
+        import test;
+                
+    select x % 10 -> x_mod_10;
+                
+                
+    """
+        )
+        assert "TYPO" in str(e.value)
+        assert 1 == 0

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/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.20"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/trilogy/core/enums.py

@@ -8,6 +8,7 @@ class UnnestMode(Enum):
     CROSS_APPLY = "cross_apply"
     CROSS_JOIN = "cross_join"
     CROSS_JOIN_ALIAS = "cross_join_alias"
+    SNOWFLAKE = "snowflake"
 
 
 class ConceptSource(Enum):

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/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

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/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(

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/trilogy/core/models/execute.py

@@ -59,6 +59,14 @@ class CTE(BaseModel):
     base_name_override: Optional[str] = None
     base_alias_override: Optional[str] = None
 
+    @field_validator("join_derived_concepts")
+    def validate_join_derived_concepts(cls, v):
+        if len(v) > 1:
+            raise NotImplementedError(
+                "Multiple join derived concepts not yet supported."
+            )
+        return unique(v, "address")
+
     @property
     def identifier(self):
         return self.name

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/trilogy/dialect/base.py

@@ -694,6 +694,7 @@ class BaseDialect:
             UnnestMode.CROSS_APPLY,
             UnnestMode.CROSS_JOIN,
             UnnestMode.CROSS_JOIN_ALIAS,
+            UnnestMode.SNOWFLAKE,
         ):
             # for a cross apply, derivation happens in the join
             # so we only use the alias to select
@@ -722,7 +723,9 @@ class BaseDialect:
                     UnnestMode.CROSS_JOIN_ALIAS,
                     UnnestMode.CROSS_JOIN,
                     UnnestMode.CROSS_APPLY,
+                    UnnestMode.SNOWFLAKE,
                 ):
+
                     source = f"{render_unnest(self.UNNEST_MODE, self.QUOTE_CHARACTER, cte.join_derived_concepts[0], self.render_concept_sql, cte)}"
                 # direct - eg DUCK DB - can be directly selected inline
                 elif (

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/trilogy/dialect/common.py

@@ -25,7 +25,12 @@ def render_unnest(
 ):
     if unnest_mode == UnnestMode.CROSS_JOIN:
         return f"{render_func(concept, cte, False)} as {quote_character}{concept.safe_address}{quote_character}"
-    return f"{render_func(concept, cte, False)} as unnest_wrapper ({quote_character}{concept.safe_address}{quote_character})"
+    elif unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
+        return f"{render_func(concept, cte, False)} as unnest_wrapper ({quote_character}{concept.safe_address}{quote_character})"
+    elif unnest_mode == UnnestMode.SNOWFLAKE:
+
+        return f"flatten({render_func(concept, cte, False)}) as unnest_wrapper ( unnest1, unnest2, unnest3, unnest4, {quote_character}{cte.join_derived_concepts[0].safe_address}{quote_character})"
+    return f"{render_func(concept, cte, False)} as {quote_character}{concept.safe_address}{quote_character}"
 
 
 def render_join_concept(
@@ -67,6 +72,8 @@ def render_join(
             return f"CROSS JOIN {render_unnest(unnest_mode, quote_character, join.concept_to_unnest, render_func, cte)}"
         if unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
             return f"CROSS JOIN {render_unnest(unnest_mode, quote_character, join.concept_to_unnest, render_func, cte)}"
+        if unnest_mode == UnnestMode.SNOWFLAKE:
+            return f"LEFT JOIN LATERAL {render_unnest(unnest_mode, quote_character, join.concept_to_unnest, render_func, cte)}"
         return f"FULL JOIN {render_unnest(unnest_mode, quote_character, join.concept_to_unnest, render_func, cte)}"
     # left_name = join.left_name
     right_name = join.right_name

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/trilogy/dialect/snowflake.py

@@ -30,6 +30,8 @@ FUNCTION_MAP = {
     FunctionType.QUARTER: lambda x: f"EXTRACT(QUARTER from {x[0]})",
     # math
     FunctionType.DIVIDE: lambda x: f"DIV0({x[0]},{x[1]})",
+    FunctionType.UNNEST: lambda x: f"table(flatten({x[0]}))",
+    FunctionType.ARRAY: lambda x: f"ARRAY_CONSTRUCT({', '.join(x)})",
 }
 
 FUNCTION_GRAIN_MATCH_MAP = {
@@ -83,4 +85,4 @@ class SnowflakeDialect(BaseDialect):
     }
     QUOTE_CHARACTER = '"'
     SQL_TEMPLATE = BQ_SQL_TEMPLATE
-    UNNEST_MODE = UnnestMode.CROSS_JOIN
+    UNNEST_MODE = UnnestMode.SNOWFLAKE

{pytrilogy-0.0.3.18 → pytrilogy-0.0.3.20}/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,
@@ -983,7 +983,12 @@ class ParseToObjects(Transformer):
             text = self.resolve_import_address(target)
             self.text_lookup[token_lookup] = text
 
-            raw_tokens = PARSER.parse(text)
+            try:
+                raw_tokens = PARSER.parse(text)
+            except Exception as e:
+                raise ImportError(
+                    f"Unable to import '{target}', parsing error: {e}"
+                ) from e
             self.tokens[token_lookup] = raw_tokens
 
         if cache_lookup in self.parsed:
@@ -1198,23 +1203,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):