pytrilogy 0.0.2.58__tar.gz → 0.0.3.0__tar.gz

{pytrilogy-0.0.2.58/pytrilogy.egg-info → pytrilogy-0.0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pytrilogy
-Version: 0.0.2.58
+Version: 0.0.3.0
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -27,6 +27,13 @@ Provides-Extra: bigquery
 Requires-Dist: sqlalchemy-bigquery; extra == "bigquery"
 Provides-Extra: snowflake
 Requires-Dist: snowflake-sqlalchemy; extra == "snowflake"
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 ## Trilogy
 [![Website](https://img.shields.io/badge/INTRO-WEB-orange?)](https://trilogydata.dev/)

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0/pytrilogy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pytrilogy
-Version: 0.0.2.58
+Version: 0.0.3.0
 Summary: Declarative, typed query language that compiles to SQL.
 Home-page: 
 Author: 
@@ -27,6 +27,13 @@ Provides-Extra: bigquery
 Requires-Dist: sqlalchemy-bigquery; extra == "bigquery"
 Provides-Extra: snowflake
 Requires-Dist: snowflake-sqlalchemy; extra == "snowflake"
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: provides-extra
+Dynamic: requires-dist
+Dynamic: summary
 
 ## Trilogy
 [![Website](https://img.shields.io/badge/INTRO-WEB-orange?)](https://trilogydata.dev/)

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/pytrilogy.egg-info/SOURCES.txt

@@ -47,9 +47,16 @@ trilogy/core/exceptions.py
 trilogy/core/functions.py
 trilogy/core/graph_models.py
 trilogy/core/internal.py
-trilogy/core/models.py
 trilogy/core/optimization.py
 trilogy/core/query_processor.py
+trilogy/core/models/__init__.py
+trilogy/core/models/author.py
+trilogy/core/models/build.py
+trilogy/core/models/build_environment.py
+trilogy/core/models/core.py
+trilogy/core/models/datasource.py
+trilogy/core/models/environment.py
+trilogy/core/models/execute.py
 trilogy/core/optimizations/__init__.py
 trilogy/core/optimizations/base_optimization.py
 trilogy/core/optimizations/inline_constant.py
@@ -84,6 +91,11 @@ trilogy/core/processing/nodes/select_node_v2.py
 trilogy/core/processing/nodes/union_node.py
 trilogy/core/processing/nodes/unnest_node.py
 trilogy/core/processing/nodes/window_node.py
+trilogy/core/statements/__init__.py
+trilogy/core/statements/author.py
+trilogy/core/statements/build.py
+trilogy/core/statements/common.py
+trilogy/core/statements/execute.py
 trilogy/dialect/__init__.py
 trilogy/dialect/base.py
 trilogy/dialect/bigquery.py

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_datatypes.py

@@ -1,5 +1,5 @@
 from trilogy.core.exceptions import InvalidSyntaxException
-from trilogy.core.models import (
+from trilogy.core.models.core import (
     NumericType,
 )
 from trilogy.parsing.parse_engine import (

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_derived_concepts.py

@@ -33,7 +33,10 @@ def test_filtering_where_on_derived_aggregate(test_environment):
         )
     except Exception as e:
         exception = True
-        assert "Undefined concept: local.filtered_cst" in str(e)
+        assert (
+            "Cannot reference an aggregate derived in the select (local.filtered_cst)"
+            in str(e)
+        )
     assert exception, "should have an exception"
 
 

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_discovery_nodes.py

@@ -1,13 +1,17 @@
 from trilogy.core.constants import ALL_ROWS_CONCEPT, INTERNAL_NAMESPACE
-from trilogy.core.models import Environment, Grain
+from trilogy.core.models.build import BuildGrain
+from trilogy.core.models.environment import Environment
 from trilogy.core.processing.concept_strategies_v3 import (
     GroupNode,
+    History,
     search_concepts,
 )
 from trilogy.core.processing.node_generators import gen_group_node
 
 
 def test_group_node(test_environment, test_environment_graph):
+    history = History(base_environment=test_environment)
+    test_environment = test_environment.materialize_for_select()
     total_revenue = test_environment.concepts["total_revenue"]
     revenue = test_environment.concepts["revenue"]
     category = test_environment.concepts["category_name"]
@@ -21,6 +25,7 @@ def test_group_node(test_environment, test_environment_graph):
                 environment=test_environment,
                 g=test_environment_graph,
                 depth=0,
+                history=history,
             )
         ],
     )
@@ -28,6 +33,8 @@ def test_group_node(test_environment, test_environment_graph):
 
 
 def test_group_node_property(test_environment: Environment, test_environment_graph):
+    history = History(base_environment=test_environment)
+    test_environment = test_environment.materialize_for_select()
     sum_name_length = test_environment.concepts["category_name_length_sum"]
 
     group_node = gen_group_node(
@@ -36,6 +43,7 @@ def test_group_node_property(test_environment: Environment, test_environment_gra
         environment=test_environment,
         g=test_environment_graph,
         source_concepts=search_concepts,
+        history=history,
         depth=0,
     )
     input_concept_names = {
@@ -50,15 +58,20 @@ def test_group_node_property(test_environment: Environment, test_environment_gra
 
 
 def test_group_node_property_all(test_environment: Environment, test_environment_graph):
+    history = History(base_environment=test_environment)
+    test_environment = test_environment.materialize_for_select()
     sum_name_length = test_environment.concepts["category_name_length_sum"]
     all_rows = test_environment.concepts[f"{INTERNAL_NAMESPACE}.{ALL_ROWS_CONCEPT}"]
-    sum_name_length_all_rows = sum_name_length.with_grain(Grain(components=[all_rows]))
+    sum_name_length_all_rows = sum_name_length.with_grain(
+        BuildGrain(components=[all_rows])
+    )
     group_node = gen_group_node(
         sum_name_length_all_rows,
         local_optional=[],
         environment=test_environment,
         g=test_environment_graph,
         source_concepts=search_concepts,
+        history=history,
         depth=0,
     )
     input_concept_names = {

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_environment.py

@@ -1,15 +1,21 @@
 from pathlib import Path
 
+from pytest import raises
+
 from trilogy import Dialects
-from trilogy.core.enums import Modifier
-from trilogy.core.exceptions import UndefinedConceptException
-from trilogy.core.models import Environment
+from trilogy.core.enums import Modifier, Purpose
+from trilogy.core.exceptions import (
+    FrozenEnvironmentException,
+    UndefinedConceptException,
+)
+from trilogy.core.models.author import Concept
+from trilogy.core.models.core import DataType
+from trilogy.core.models.environment import Environment, LazyEnvironment
 
 
 def test_environment_serialization(test_environment: Environment):
 
     path = test_environment.to_cache()
-    print(path)
     test_environment2 = Environment.from_cache(path)
     assert test_environment2
 
@@ -25,6 +31,36 @@ def test_environment_from_path():
     assert "local.id" in env.concepts
 
 
+def test_lazy_environment_from_path():
+    env = LazyEnvironment(load_path=Path(__file__).parent / "test_env.preql")
+
+    assert not env.loaded
+
+    _ = len(env.concepts)
+
+    assert env.loaded
+
+    env2 = Environment.from_file(Path(__file__).parent / "test_env.preql")
+
+    assert env.concepts == env2.concepts
+
+
+def test_frozen_environment():
+    env = Environment.from_file(Path(__file__).parent / "test_env.preql")
+
+    exec = Dialects.DUCK_DB.default_executor(environment=env)
+
+    run = exec.execute_query(
+        """select id+5 ->id_plus_5 order by id_plus_5 asc;"""
+    ).fetchall()
+    assert run[0].id_plus_5 == 6
+    env.freeze()
+    with raises(FrozenEnvironmentException):
+        env.add_concept(
+            Concept(name="test", datatype=DataType.INTEGER, purpose=Purpose.KEY)
+        )
+
+
 def test_environment_invalid():
     env = Environment()
     env.concepts.fail_on_missing = False

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_executor.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
-from trilogy import Dialects, Environment, parse
+from trilogy import Dialects, parse
+from trilogy.core.models.environment import Environment
 
 
 def test_file_parsing():

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_functions.py

@@ -6,10 +6,12 @@ from pytest import raises
 
 from trilogy import Dialects
 from trilogy.constants import logger
-from trilogy.core.enums import Purpose, PurposeLineage
+from trilogy.core.enums import Derivation, Purpose
 from trilogy.core.exceptions import InvalidSyntaxException
-from trilogy.core.models import DataType, Environment, ListType, SelectStatement
+from trilogy.core.models.core import DataType, ListType
+from trilogy.core.models.environment import Environment
 from trilogy.core.query_processor import process_query
+from trilogy.core.statements.author import SelectStatement
 from trilogy.dialect.base import BaseDialect
 from trilogy.dialect.bigquery import BigqueryDialect
 from trilogy.dialect.duckdb import DuckDBDialect
@@ -107,6 +109,7 @@ def test_date_functions(test_environment):
 
     select
         order_id,
+        order_timestamp,
         date(order_timestamp) -> order_date,
         datetime(order_timestamp) -> order_timestamp_datetime,
         timestamp(order_timestamp) -> order_timestamp_dos,
@@ -344,4 +347,4 @@ def test_validate_constant_functions():
             """
     )
     assert env.concepts["current_date"].purpose == Purpose.CONSTANT
-    assert env.concepts["current_date"].derivation == PurposeLineage.CONSTANT
+    assert env.concepts["current_date"].derivation == Derivation.CONSTANT

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_imports.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from trilogy import Environment
+from trilogy.core.models.environment import Environment
 
 
 def test_multi_environment():

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_metadata.py

@@ -1,6 +1,7 @@
 from pathlib import Path
 
-from trilogy import Environment, parse
+from trilogy import parse
+from trilogy.core.models.environment import Environment
 
 
 def test_metadata():

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_models.py

@@ -1,29 +1,43 @@
 from copy import deepcopy
 
 from trilogy import parse
-from trilogy.core.enums import BooleanOperator, ComparisonOperator, JoinType, Purpose
-from trilogy.core.models import (
-    CTE,
-    Address,
+from trilogy.core.enums import (
+    BooleanOperator,
+    ComparisonOperator,
+    FunctionType,
+    JoinType,
+    Purpose,
+)
+from trilogy.core.models.author import (
     AggregateWrapper,
-    BaseJoin,
     Comparison,
     Concept,
     Conditional,
-    CTEConceptPair,
-    DataType,
-    Environment,
+    Function,
     Grain,
-    Join,
-    QueryDatasource,
+    Parenthetical,
     RowsetItem,
-    SelectStatement,
-    TupleWrapper,
     UndefinedConcept,
 )
+from trilogy.core.models.build import BuildGrain
+from trilogy.core.models.core import (
+    DataType,
+    TupleWrapper,
+)
+from trilogy.core.models.datasource import Address
+from trilogy.core.models.environment import Environment
+from trilogy.core.models.execute import (
+    CTE,
+    BaseJoin,
+    CTEConceptPair,
+    Join,
+    QueryDatasource,
+)
+from trilogy.core.statements.author import SelectStatement
 
 
 def test_cte_merge(test_environment, test_environment_graph):
+    test_environment = test_environment.materialize_for_select()
     datasource = list(test_environment.datasources.values())[0]
     outputs = [c.concept for c in datasource.columns]
     output_map = {
@@ -35,12 +49,12 @@ def test_cte_merge(test_environment, test_environment_graph):
     a = CTE(
         name="test",
         output_columns=[outputs[0]],
-        grain=Grain(),
+        grain=BuildGrain(),
         source=QueryDatasource(
             input_concepts=[outputs[0]],
             output_concepts=[outputs[0]],
             datasources=[datasource],
-            grain=Grain(),
+            grain=BuildGrain(),
             joins=[],
             source_map={outputs[0].address: {datasource}},
         ),
@@ -49,12 +63,12 @@ def test_cte_merge(test_environment, test_environment_graph):
     b = CTE(
         name="testb",
         output_columns=outputs,
-        grain=Grain(),
+        grain=BuildGrain(),
         source=QueryDatasource(
             input_concepts=outputs,
             output_concepts=outputs,
             datasources=[datasource],
-            grain=Grain(),
+            grain=BuildGrain(),
             joins=[],
             source_map=output_map,
         ),
@@ -151,33 +165,22 @@ def test_select(test_environment: Environment):
         selection=[oid, pid, cid, cname], grain=Grain(components=[oid, pid, cid])
     )
     ds = x.to_datasource(
-        test_environment.namespace, "test", address=Address(location="test")
+        test_environment.namespace,
+        "test",
+        address=Address(location="test"),
+        environment=test_environment,
     )
 
     assert ds.grain.components == Grain(components=[oid, pid, cid]).components
 
 
 def test_undefined(test_environment: Environment):
-    x = UndefinedConcept(
-        name="test",
-        datatype="int",
-        purpose=Purpose.CONSTANT,
-        grain=Grain(),
-        namespace="test",
-        environment=test_environment.concepts,
-    )
-
-    # y = x.with_select_context({}, Grain(components=[test_environment.concepts["order_id"]]), test_environment)
-
-    # assert y.grain == Grain(components=[test_environment.concepts["order_id"]])
-
-    z = x.with_default_grain()
-
-    assert z.grain == Grain()
+    UndefinedConcept(address="test.test")
 
 
 def test_base_join(test_environment: Environment):
     exc: SyntaxError | None = None
+    test_environment = test_environment.materialize_for_select()
     try:
         BaseJoin(
             left_datasource=test_environment.datasources["revenue"],
@@ -211,6 +214,7 @@ def test_comparison():
 
 
 def test_join(test_environment: Environment):
+    test_environment = test_environment.materialize_for_select()
     datasource = list(test_environment.datasources.values())[0]
     outputs = [c.concept for c in datasource.columns]
     output_map = {
@@ -222,12 +226,12 @@ def test_join(test_environment: Environment):
     a = CTE(
         name="test",
         output_columns=[outputs[0]],
-        grain=Grain(),
+        grain=BuildGrain(),
         source=QueryDatasource(
             input_concepts=[outputs[0]],
             output_concepts=[outputs[0]],
             datasources=[datasource],
-            grain=Grain(),
+            grain=BuildGrain(),
             joins=[],
             source_map={outputs[0].address: {datasource}},
         ),
@@ -237,12 +241,12 @@ def test_join(test_environment: Environment):
     b = CTE(
         name="testb",
         output_columns=outputs,
-        grain=Grain(),
+        grain=BuildGrain(),
         source=QueryDatasource(
             input_concepts=outputs,
             output_concepts=outputs,
             datasources=[datasource],
-            grain=Grain(),
+            grain=BuildGrain(),
             joins=[],
             source_map=output_map,
         ),
@@ -270,7 +274,6 @@ def test_concept_address_in_check():
         datatype="int",
         purpose=Purpose.CONSTANT,
         grain=Grain(),
-        environment={},
     )
     assert target.address == "local.test"
     x = [target]
@@ -304,10 +307,39 @@ select avg_greater_ten;
 
     lineage = env.concepts["avg_greater_ten"].lineage
     assert isinstance(lineage, AggregateWrapper)
-    assert isinstance(lineage.function.concept_arguments[0].lineage, RowsetItem)
+    assert isinstance(
+        env.concepts[lineage.function.concept_arguments[0]].lineage, RowsetItem
+    )
 
 
 def test_tuple_clone():
     x = TupleWrapper([1, 2, 3], type=DataType.INTEGER)
     y = deepcopy(x)
     assert y == x
+
+
+def test_parenthetical(test_environment: Environment):
+    x = Parenthetical(content=TupleWrapper([1, 2, 3], type=DataType.INTEGER))
+
+    assert x.concept_arguments == []
+
+    x = Parenthetical(
+        content=test_environment.concepts["order_id"], type=DataType.INTEGER
+    )
+    # return concept if it's a concept
+    assert x.concept_arguments == [test_environment.concepts["order_id"]]
+    function = Function(
+        operator=FunctionType.COUNT,
+        output_datatype=DataType.INTEGER,
+        output_purpose=Purpose.METRIC,
+        arguments=[test_environment.concepts["order_id"]],
+    )
+    assert function.concept_arguments == [
+        test_environment.concepts["order_id"].reference
+    ]
+    x = Parenthetical(content=function)
+    # else pass through parent
+    assert x.concept_arguments == [test_environment.concepts["order_id"].reference]
+
+    merged = x + x
+    assert isinstance(merged, Conditional)

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_multi_join_assignments.py

@@ -1,6 +1,7 @@
 # from trilogy.compiler import compile
-from trilogy.core.models import Grain, SelectStatement
+from trilogy.core.models.author import Grain
 from trilogy.core.query_processor import process_query
+from trilogy.core.statements.author import SelectStatement
 from trilogy.parser import parse
 
 TEST_SETUP = r"""

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_parse_engine.py

@@ -1,7 +1,7 @@
 from pytest import raises
 
-from trilogy import Environment
 from trilogy.core.exceptions import UndefinedConceptException
+from trilogy.core.models.environment import Environment
 from trilogy.parsing.parse_engine import PARSER, ParseToObjects, unpack_visit_error
 
 TEXT = """
@@ -17,7 +17,6 @@ select
 def test_parser():
     env = Environment()
     x = ParseToObjects(environment=env)
-    x.environment.concepts.fail_on_missing = False
     x.set_text(TEXT)
 
     failed = False

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_parsing.py

@@ -2,16 +2,15 @@ from trilogy import Dialects
 from trilogy.constants import MagicConstants
 from trilogy.core.enums import BooleanOperator, ComparisonOperator, Purpose
 from trilogy.core.functions import argument_to_purpose, function_args_to_output_purpose
-from trilogy.core.models import (
-    Comparison,
-    Datasource,
+from trilogy.core.models.author import Comparison
+from trilogy.core.models.core import (
     DataType,
-    Environment,
-    ProcessedQuery,
-    SelectStatement,
-    ShowStatement,
     TupleWrapper,
 )
+from trilogy.core.models.datasource import Datasource
+from trilogy.core.models.environment import Environment
+from trilogy.core.statements.author import SelectStatement, ShowStatement
+from trilogy.core.statements.execute import ProcessedQuery
 from trilogy.dialect.base import BaseDialect
 from trilogy.parsing.parse_engine import (
     arg_to_datatype,
@@ -390,6 +389,14 @@ select composite_id;
 """
     executor.parse_text(test_case)
 
+    assert (
+        "local.composite_id_alt"
+        in executor.environment.concepts["local.composite_id"].pseudonyms
+    )
+    assert (
+        "local.composite_id"
+        in executor.environment.alias_origin_lookup["local.composite_id_alt"].pseudonyms
+    )
     results = executor.execute_text(test_case)[0].fetchall()
 
     assert results == [("123-abc",)]

{pytrilogy-0.0.2.58 → pytrilogy-0.0.3.0}/tests/test_partial_handling.py

@@ -1,16 +1,14 @@
-# from trilogy.core.models import Environment
 from sqlalchemy import create_engine
 
 from trilogy import Dialects, Executor
 from trilogy.core.enums import Purpose
-from trilogy.core.models import (
-    ColumnAssignment,
-    Concept,
-    Datasource,
+from trilogy.core.models.author import Concept
+from trilogy.core.models.core import (
     DataType,
-    Environment,
 )
-from trilogy.core.processing.concept_strategies_v3 import search_concepts
+from trilogy.core.models.datasource import ColumnAssignment, Datasource
+from trilogy.core.models.environment import Environment
+from trilogy.core.processing.concept_strategies_v3 import History, search_concepts
 from trilogy.core.processing.node_generators import (
     gen_filter_node,
 )
@@ -104,12 +102,14 @@ def test_partial_assignment():
 
     executor = setup_engine()
     env = Environment()
+    history = History(base_environment=env)
     setup_titanic(env)
     executor.environment = env
     executor.hooks = [DebuggingHook()]
     test = """property passenger.id.family <- split(passenger.name, ',')[1]; 
     auto surviving_passenger<- filter passenger.id where passenger.survived =1;"""
     _ = executor.parse_text(test)
+    env = env.materialize_for_select()
     family = env.concepts["passenger.family"]
     # id = env.concepts["passenger.id"]
     # survived = env.concepts["passenger.survived"]
@@ -117,6 +117,7 @@ def test_partial_assignment():
     filtered_node = gen_filter_node(
         env.concepts["surviving_passenger"],
         [family],
+        history=history,
         environment=env,
         g=g,
         depth=0,
@@ -132,7 +133,11 @@ def test_partial_assignment():
 
     # check at the source level
     sourced = search_concepts(
-        [family, env.concepts["surviving_passenger"]], environment=env, g=g, depth=0
+        [family, env.concepts["surviving_passenger"]],
+        history=history,
+        environment=env,
+        g=g,
+        depth=0,
     )
     assert isinstance(sourced, MergeNode)
     assert len(sourced.parents) == 2