pytrilogy 0.0.2.15__tar.gz → 0.0.2.18__tar.gz

{pytrilogy-0.0.2.15/pytrilogy.egg-info → pytrilogy-0.0.2.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.15
+Version: 0.0.2.18
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -42,15 +42,15 @@ Installation: `pip install pytrilogy`
 
 `pytrilogy` can be run locally to parse and execute trilogy model [.preql] files using the `trilogy` CLI tool, or can be run in python by importing the `trilogy` package.
 
-You can read more about the project [here](https://trilogydata.dev/) and try out an interactive demo on the page an interactive demo [here](https://trilogydata.dev/demo). 
+You can read more about the project [here](https://trilogydata.dev/) and try out an interactive demo [here](https://trilogydata.dev/demo/). 
 
 Trilogy:
 ```sql
+WHERE 
+    name like '%lvis%'
 SELECT
     name,
     count(name) as name_count
-WHERE 
-    name='Elvis'
 ORDER BY
     name_count desc
 LIMIT 10;
@@ -145,7 +145,7 @@ Run the following from the directory the file is in.
 trilogy run hello.trilogy duckdb
 ```
 
-![UI Preview](./docs/hello_world.png)
+![UI Preview](./hello_world.png)
 
 ## Backends
 
@@ -214,7 +214,7 @@ for row in results:
 
 ## Basic Example - CLI
 
-Trilogy can be run through a CLI tool, appropriately named 'trilogy'.
+Trilogy can be run through a CLI tool, also named 'trilogy'.
 
 After installing trilogy, you can run the trilogy CLI with two required positional arguments; the first the path to a file or a direct command,
 and second the dialect to run.
@@ -252,7 +252,7 @@ N/A, only supports default auth. In python you can pass in a custom client.
 
 ## More Examples
 
-[Interactive demo](https://trilogydata.dev/demo). 
+[Interactive demo](https://trilogydata.dev/demo/). 
 
 Additional examples can be found in the [public model repository](https://github.com/trilogydata/trilogy-public-models).
 
@@ -267,11 +267,15 @@ Clone repository and install requirements.txt and requirements-test.txt.
 Please open an issue first to discuss what you would like to change, and then create a PR against that issue.
 
 ## Similar in space
+Trilogy combines two aspects; a semantic layer and a query language. We've covered examples of both below:
+
+Python "semantic layers" are tools for defining data access to a warehouse in a more abstract way.
+
+- [metricsflow](https://github.com/dbt-labs/metricflow)
 
 "Better SQL" has been a popular space. We believe Trilogy takes a different approach then the following,
 but all are worth checking out. Please open PRs/comment for anything missed!
 
-
 - [malloy](https://github.com/malloydata/malloy)
 - [preql](https://github.com/erezsh/Preql)
 - [PREQL](https://github.com/PRQL/prql)

{pytrilogy-0.0.2.15 → pytrilogy-0.0.2.18}/README.md

@@ -13,15 +13,15 @@ Installation: `pip install pytrilogy`
 
 `pytrilogy` can be run locally to parse and execute trilogy model [.preql] files using the `trilogy` CLI tool, or can be run in python by importing the `trilogy` package.
 
-You can read more about the project [here](https://trilogydata.dev/) and try out an interactive demo on the page an interactive demo [here](https://trilogydata.dev/demo). 
+You can read more about the project [here](https://trilogydata.dev/) and try out an interactive demo [here](https://trilogydata.dev/demo/). 
 
 Trilogy:
 ```sql
+WHERE 
+    name like '%lvis%'
 SELECT
     name,
     count(name) as name_count
-WHERE 
-    name='Elvis'
 ORDER BY
     name_count desc
 LIMIT 10;
@@ -116,7 +116,7 @@ Run the following from the directory the file is in.
 trilogy run hello.trilogy duckdb
 ```
 
-![UI Preview](./docs/hello_world.png)
+![UI Preview](./hello_world.png)
 
 ## Backends
 
@@ -185,7 +185,7 @@ for row in results:
 
 ## Basic Example - CLI
 
-Trilogy can be run through a CLI tool, appropriately named 'trilogy'.
+Trilogy can be run through a CLI tool, also named 'trilogy'.
 
 After installing trilogy, you can run the trilogy CLI with two required positional arguments; the first the path to a file or a direct command,
 and second the dialect to run.
@@ -223,7 +223,7 @@ N/A, only supports default auth. In python you can pass in a custom client.
 
 ## More Examples
 
-[Interactive demo](https://trilogydata.dev/demo). 
+[Interactive demo](https://trilogydata.dev/demo/). 
 
 Additional examples can be found in the [public model repository](https://github.com/trilogydata/trilogy-public-models).
 
@@ -238,11 +238,15 @@ Clone repository and install requirements.txt and requirements-test.txt.
 Please open an issue first to discuss what you would like to change, and then create a PR against that issue.
 
 ## Similar in space
+Trilogy combines two aspects; a semantic layer and a query language. We've covered examples of both below:
+
+Python "semantic layers" are tools for defining data access to a warehouse in a more abstract way.
+
+- [metricsflow](https://github.com/dbt-labs/metricflow)
 
 "Better SQL" has been a popular space. We believe Trilogy takes a different approach then the following,
 but all are worth checking out. Please open PRs/comment for anything missed!
 
-
 - [malloy](https://github.com/malloydata/malloy)
 - [preql](https://github.com/erezsh/Preql)
 - [PREQL](https://github.com/PRQL/prql)

{pytrilogy-0.0.2.15 → pytrilogy-0.0.2.18/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pytrilogy
-Version: 0.0.2.15
+Version: 0.0.2.18
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -42,15 +42,15 @@ Installation: `pip install pytrilogy`
 
 `pytrilogy` can be run locally to parse and execute trilogy model [.preql] files using the `trilogy` CLI tool, or can be run in python by importing the `trilogy` package.
 
-You can read more about the project [here](https://trilogydata.dev/) and try out an interactive demo on the page an interactive demo [here](https://trilogydata.dev/demo). 
+You can read more about the project [here](https://trilogydata.dev/) and try out an interactive demo [here](https://trilogydata.dev/demo/). 
 
 Trilogy:
 ```sql
+WHERE 
+    name like '%lvis%'
 SELECT
     name,
     count(name) as name_count
-WHERE 
-    name='Elvis'
 ORDER BY
     name_count desc
 LIMIT 10;
@@ -145,7 +145,7 @@ Run the following from the directory the file is in.
 trilogy run hello.trilogy duckdb
 ```
 
-![UI Preview](./docs/hello_world.png)
+![UI Preview](./hello_world.png)
 
 ## Backends
 
@@ -214,7 +214,7 @@ for row in results:
 
 ## Basic Example - CLI
 
-Trilogy can be run through a CLI tool, appropriately named 'trilogy'.
+Trilogy can be run through a CLI tool, also named 'trilogy'.
 
 After installing trilogy, you can run the trilogy CLI with two required positional arguments; the first the path to a file or a direct command,
 and second the dialect to run.
@@ -252,7 +252,7 @@ N/A, only supports default auth. In python you can pass in a custom client.
 
 ## More Examples
 
-[Interactive demo](https://trilogydata.dev/demo). 
+[Interactive demo](https://trilogydata.dev/demo/). 
 
 Additional examples can be found in the [public model repository](https://github.com/trilogydata/trilogy-public-models).
 
@@ -267,11 +267,15 @@ Clone repository and install requirements.txt and requirements-test.txt.
 Please open an issue first to discuss what you would like to change, and then create a PR against that issue.
 
 ## Similar in space
+Trilogy combines two aspects; a semantic layer and a query language. We've covered examples of both below:
+
+Python "semantic layers" are tools for defining data access to a warehouse in a more abstract way.
+
+- [metricsflow](https://github.com/dbt-labs/metricflow)
 
 "Better SQL" has been a popular space. We believe Trilogy takes a different approach then the following,
 but all are worth checking out. Please open PRs/comment for anything missed!
 
-
 - [malloy](https://github.com/malloydata/malloy)
 - [preql](https://github.com/erezsh/Preql)
 - [PREQL](https://github.com/PRQL/prql)

{pytrilogy-0.0.2.15 → pytrilogy-0.0.2.18}/pytrilogy.egg-info/SOURCES.txt

@@ -64,6 +64,7 @@ trilogy/core/processing/node_generators/group_to_node.py
 trilogy/core/processing/node_generators/multiselect_node.py
 trilogy/core/processing/node_generators/node_merge_node.py
 trilogy/core/processing/node_generators/rowset_node.py
+trilogy/core/processing/node_generators/select_merge_node.py
 trilogy/core/processing/node_generators/select_node.py
 trilogy/core/processing/node_generators/unnest_node.py
 trilogy/core/processing/node_generators/window_node.py

pytrilogy-0.0.2.18/tests/test_derived_concepts.py

@@ -0,0 +1,89 @@
+from trilogy import parse
+
+
+def test_derivations(test_environment):
+    assert (
+        test_environment.concepts["order_timestamp"].address == "local.order_timestamp"
+    )
+    assert (
+        test_environment.concepts["order_timestamp.date"].address
+        == "local.order_timestamp.date"
+    )
+
+
+def test_filtering_where_on_derived_aggregate(test_environment):
+    exception = False
+    try:
+        env, _ = parse(
+            """key x int;
+    property x.cost float;
+
+    datasource x_source (
+        x:x,
+        cost:cost)
+        grain(x)
+        address x_source;
+
+
+    SELECT
+        sum(cost)-> filtered_cst
+    where
+    x > 10 and filtered_cst >1000;
+        """
+        )
+    except Exception as e:
+        exception = True
+        assert str(e).startswith(
+            "Cannot reference an aggregate derived in the select (local.filtered_cst) in the same statement where clause"
+        )
+    assert exception, "should have an exception"
+
+
+def test_filtering_having_on_unincluded_value(test_environment):
+    exception = False
+    try:
+        env, _ = parse(
+            """key x int;
+    property x.cost float;
+
+    datasource x_source (
+        x:x,
+        cost:cost)
+        grain(x)
+        address x_source;
+
+
+    SELECT
+        sum(cost)-> filtered_cst
+    having
+    x > 10 and filtered_cst >1000;
+        """
+        )
+    except Exception as e:
+        exception = True
+        assert str(e).startswith(
+            "Cannot reference a column (local.x) that is not in the select projection in the HAVING clause, move to WHERE"
+        ), str(e)
+    assert exception, "should have an exception"
+
+
+def test_filtering_valid(test_environment):
+
+    env, _ = parse(
+        """key x int;
+property x.cost float;
+
+datasource x_source (
+    x:x,
+    cost:cost)
+    grain(x)
+    address x_source;
+
+where
+    x>-10
+SELECT
+    sum(cost)-> filtered_cst
+having
+    filtered_cst >1000;
+    """
+    )

{pytrilogy-0.0.2.15 → pytrilogy-0.0.2.18}/tests/test_discovery_nodes.py

@@ -45,8 +45,6 @@ def test_group_node_property(test_environment: Environment, test_environment_gra
         if x not in group_node.parents[0].hidden_concepts
     }
     assert input_concept_names == {"category_name_length", "category_id"}
-    # assert len(input_concept.grain.components) == 1
-    # assert input_concept.grain.components[0].name == "category_id"
     final = group_node.resolve()
     assert len(final.datasources) == 1
     assert final.datasources[0].group_required is False

{pytrilogy-0.0.2.15 → pytrilogy-0.0.2.18}/tests/test_models.py

@@ -13,7 +13,10 @@ from trilogy.core.models import (
     Join,
     JoinKey,
     Concept,
+    AggregateWrapper,
+    RowsetItem,
 )
+from trilogy import parse
 
 
 def test_cte_merge(test_environment, test_environment_graph):
@@ -262,3 +265,46 @@ def test_join(test_environment: Environment):
         str(test)
         == "right outer JOIN test and testb on local.product_id<local.product_id>,local.category_id<local.category_id>"
     ), str(test)
+
+
+def test_concept_address_in_check():
+    target = Concept(
+        name="test",
+        datatype="int",
+        purpose=Purpose.CONSTANT,
+        grain=Grain(),
+        environment={},
+    )
+    assert target.address == "local.test"
+    x = [target]
+
+    assert "local.test" in x
+
+
+def test_rowset_with_filter_derivation():
+    env, statements = parse(
+        """
+key x int;
+
+datasource test (
+x:x
+)
+grain (x)
+address test
+;
+
+with greater_than_ten as
+select x
+where 
+x >10;
+
+auto avg_greater_ten <- avg(greater_than_ten.x) by *;
+
+select avg_greater_ten;
+
+"""
+    )
+
+    lineage = env.concepts["avg_greater_ten"].lineage
+    assert isinstance(lineage, AggregateWrapper)
+    assert isinstance(lineage.function.concept_arguments[0].lineage, RowsetItem)

{pytrilogy-0.0.2.15 → pytrilogy-0.0.2.18}/tests/test_query_processing.py

@@ -26,22 +26,19 @@ def test_get_datasource_from_window_function(
     product_rank = test_environment.concepts["product_revenue_rank"]
     #        concept, grain: Grain, environment: Environment, g: ReferenceGraph, query_graph: ReferenceGraph
     # assert product_rank.grain.components[0] == test_environment.concepts['name']
-    datasource = search_concepts(
+    node = search_concepts(
         [product_rank] + product_rank.grain.components_copy,
         environment=test_environment,
         g=test_environment_graph,
         depth=0,
-    ).resolve()
+    )
+
+    # raise SyntaxError(product_rank.grain)
+    datasource = node.resolve()
     assert product_rank in datasource.output_concepts
     # assert datasource.grain == product_rank.grain
     assert isinstance(datasource, QueryDatasource)
-    assert (
-        datasource.grain.set
-        == Grain(
-            components=[test_environment.concepts["total_revenue"]]
-            + product_rank.grain.components_copy
-        ).set
-    )
+    assert datasource.grain.set == product_rank.grain.set
 
     product_rank_by_category = test_environment.concepts[
         "product_revenue_rank_by_category"
@@ -82,6 +79,9 @@ def test_get_datasource_for_filter(
 
 
 def test_select_output(test_environment, test_environment_graph):
+    from trilogy.hooks.query_debugger import DebuggingHook
+
+    DebuggingHook()
     product = test_environment.concepts["product_id"]
     #        concept, grain: Grain, environment: Environment, g: ReferenceGraph, query_graph: ReferenceGraph
 

{pytrilogy-0.0.2.15 → pytrilogy-0.0.2.18}/trilogy/__init__.py

@@ -4,6 +4,6 @@ from trilogy.executor import Executor
 from trilogy.parser import parse
 from trilogy.constants import CONFIG
 
-__version__ = "0.0.2.15"
+__version__ = "0.0.2.18"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.2.15 → pytrilogy-0.0.2.18}/trilogy/constants.py

@@ -24,7 +24,7 @@ class Optimizations:
     predicate_pushdown: bool = True
     datasource_inlining: bool = True
     constant_inlining: bool = True
-    constant_inline_cutoff: int = 3
+    constant_inline_cutoff: int = 10
     direct_return: bool = True
 
 

{pytrilogy-0.0.2.15 → pytrilogy-0.0.2.18}/trilogy/core/enums.py

@@ -119,6 +119,7 @@ class FunctionType(Enum):
     CONSTANT = "constant"
     COALESCE = "coalesce"
     IS_NULL = "isnull"
+    BOOL = "bool"
 
     # COMPLEX
     INDEX_ACCESS = "index_access"

{pytrilogy-0.0.2.15 → pytrilogy-0.0.2.18}/trilogy/core/functions.py

@@ -340,6 +340,17 @@ def IsNull(args: list[Concept]) -> Function:
     )
 
 
+def Bool(args: list[Concept]) -> Function:
+    return Function(
+        operator=FunctionType.BOOL,
+        arguments=args,
+        output_datatype=DataType.BOOL,
+        output_purpose=function_args_to_output_purpose(args),
+        arg_count=1,
+        # output_grain=Grain(components=arguments),
+    )
+
+
 def StrPos(args: list[Concept]) -> Function:
     return Function(
         operator=FunctionType.STRPOS,