pytrilogy 0.0.2.46__tar.gz → 0.0.2.48__tar.gz

{pytrilogy-0.0.2.46/pytrilogy.egg-info → pytrilogy-0.0.2.48}/PKG-INFO

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

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/pyproject.toml

@@ -8,3 +8,4 @@ log_cli_level="INFO"
 [tool.ruff]
 # Allow lines to be as long as 200 characters.
 line-length = 200
+lint.extend-select = ["I"]

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/pytrilogy.egg-info/SOURCES.txt

@@ -70,6 +70,7 @@ 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/union_node.py
 trilogy/core/processing/node_generators/unnest_node.py
 trilogy/core/processing/node_generators/window_node.py
 trilogy/core/processing/nodes/__init__.py
@@ -78,6 +79,7 @@ trilogy/core/processing/nodes/filter_node.py
 trilogy/core/processing/nodes/group_node.py
 trilogy/core/processing/nodes/merge_node.py
 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/dialect/__init__.py

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_derived_concepts.py

@@ -33,9 +33,7 @@ def test_filtering_where_on_derived_aggregate(test_environment):
         )
     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 "Undefined concept: local.filtered_cst" in str(e)
     assert exception, "should have an exception"
 
 
@@ -68,7 +66,6 @@ def test_filtering_having_on_unincluded_value(test_environment):
 
 
 def test_filtering_valid(test_environment):
-
     env, _ = parse(
         """key x int;
 property x.cost float;

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_discovery_nodes.py

@@ -1,10 +1,10 @@
+from trilogy.core.constants import ALL_ROWS_CONCEPT, INTERNAL_NAMESPACE
+from trilogy.core.models import Environment, Grain
 from trilogy.core.processing.concept_strategies_v3 import (
     GroupNode,
     search_concepts,
 )
 from trilogy.core.processing.node_generators import gen_group_node
-from trilogy.core.models import Environment, Grain
-from trilogy.core.constants import INTERNAL_NAMESPACE, ALL_ROWS_CONCEPT
 
 
 def test_group_node(test_environment, test_environment_graph):

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_enums.py

@@ -1,4 +1,4 @@
-from trilogy.core.enums import BooleanOperator, Boolean
+from trilogy.core.enums import Boolean, BooleanOperator
 
 
 def test_boolean_operator():

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_environment.py

@@ -1,7 +1,9 @@
-from trilogy.core.models import Environment
 from pathlib import Path
+
+from trilogy import Dialects
 from trilogy.core.enums import Modifier
 from trilogy.core.exceptions import UndefinedConceptException
+from trilogy.core.models import Environment
 
 
 def test_environment_serialization(test_environment: Environment):
@@ -18,14 +20,12 @@ def test_environment_serialization(test_environment: Environment):
 
 
 def test_environment_from_path():
-
     env = Environment.from_file(Path(__file__).parent / "test_env.preql")
 
     assert "local.id" in env.concepts
 
 
 def test_environment_invalid():
-
     env = Environment()
     env.concepts.fail_on_missing = False
     x = env.concepts["abc"]
@@ -85,3 +85,19 @@ key  order_id int;
             assert x.modifiers == [Modifier.PARTIAL]
             found = True
     assert found
+
+
+def test_environment_select_promotion():
+    x = Dialects.DUCK_DB.default_executor()
+
+    results = x.execute_query(
+        """
+const x <- 6;
+
+select x+2 as y;
+
+select y;            
+                    """
+    ).fetchall()
+
+    assert results[0].y == 8

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_executor.py

@@ -1,6 +1,7 @@
-from trilogy import Dialects, parse, Environment
 from pathlib import Path
 
+from trilogy import Dialects, Environment, parse
+
 
 def test_file_parsing():
     target = Path(__file__).parent / "test_env.preql"

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_functions.py

@@ -1,18 +1,19 @@
 # from trilogy.compiler import compile
+from logging import INFO
+
 from pytest import raises
 
+from trilogy.constants import logger
+from trilogy.core.enums import Purpose, PurposeLineage
 from trilogy.core.exceptions import InvalidSyntaxException
-from trilogy.core.models import DataType, SelectStatement, ListType, Environment
+from trilogy.core.models import DataType, Environment, ListType, SelectStatement
 from trilogy.core.query_processor import process_query
 from trilogy.dialect.base import BaseDialect
 from trilogy.dialect.bigquery import BigqueryDialect
 from trilogy.dialect.duckdb import DuckDBDialect
-from trilogy.dialect.sql_server import SqlServerDialect
 from trilogy.dialect.snowflake import SnowflakeDialect
+from trilogy.dialect.sql_server import SqlServerDialect
 from trilogy.parser import parse
-from logging import INFO
-from trilogy.constants import logger
-from trilogy.core.enums import PurposeLineage, Purpose
 
 logger.setLevel(INFO)
 

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_imports.py

@@ -1,6 +1,7 @@
-from trilogy import Environment
 from pathlib import Path
 
+from trilogy import Environment
+
 
 def test_multi_environment():
     basic = Environment()

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_metadata.py

@@ -1,6 +1,7 @@
-from trilogy import parse, Environment
 from pathlib import Path
 
+from trilogy import Environment, parse
+
 
 def test_metadata():
     env, _ = parse(

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_models.py

@@ -1,25 +1,26 @@
-from trilogy.core.enums import BooleanOperator, Purpose, JoinType, ComparisonOperator
+from copy import deepcopy
+
+from trilogy import parse
+from trilogy.core.enums import BooleanOperator, ComparisonOperator, JoinType, Purpose
 from trilogy.core.models import (
     CTE,
-    Grain,
-    QueryDatasource,
-    Conditional,
-    SelectStatement,
-    Environment,
     Address,
-    UndefinedConcept,
+    AggregateWrapper,
     BaseJoin,
     Comparison,
-    Join,
-    CTEConceptPair,
     Concept,
-    AggregateWrapper,
+    Conditional,
+    CTEConceptPair,
+    DataType,
+    Environment,
+    Grain,
+    Join,
+    QueryDatasource,
     RowsetItem,
+    SelectStatement,
     TupleWrapper,
-    DataType,
+    UndefinedConcept,
 )
-from trilogy import parse
-from copy import deepcopy
 
 
 def test_cte_merge(test_environment, test_environment_graph):
@@ -162,9 +163,9 @@ def test_undefined(test_environment: Environment):
         environment=test_environment.concepts,
     )
 
-    y = x.with_select_context(Grain(components=[test_environment.concepts["order_id"]]))
+    # y = x.with_select_context({}, Grain(components=[test_environment.concepts["order_id"]]), test_environment)
 
-    assert y.grain == Grain(components=[test_environment.concepts["order_id"]])
+    # assert y.grain == Grain(components=[test_environment.concepts["order_id"]])
 
     z = x.with_default_grain()
 

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_multi_join_assignments.py

@@ -1,5 +1,5 @@
 # from trilogy.compiler import compile
-from trilogy.core.models import SelectStatement, Grain
+from trilogy.core.models import Grain, SelectStatement
 from trilogy.core.query_processor import process_query
 from trilogy.parser import parse
 

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_parse_engine.py

@@ -1,7 +1,8 @@
-from trilogy.parsing.parse_engine import ParseToObjects, PARSER, unpack_visit_error
+from pytest import raises
+
 from trilogy import Environment
 from trilogy.core.exceptions import UndefinedConceptException
-from pytest import raises
+from trilogy.parsing.parse_engine import PARSER, ParseToObjects, unpack_visit_error
 
 TEXT = """
 const a <- 1;
@@ -18,10 +19,11 @@ def test_parser():
     x = ParseToObjects(environment=env)
     x.environment.concepts.fail_on_missing = False
     x.set_text(TEXT)
-    tokens = PARSER.parse(TEXT)
-    x.transform(tokens)
+
     failed = False
     try:
+        tokens = PARSER.parse(TEXT)
+        x.transform(tokens)
         x.hydrate_missing()
     except Exception as e:
         failed = True

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_parsing.py

@@ -1,23 +1,22 @@
-from trilogy.core.enums import Purpose, ComparisonOperator
+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,
     DataType,
+    Environment,
     ProcessedQuery,
-    ShowStatement,
     SelectStatement,
-    Environment,
-    Comparison,
+    ShowStatement,
     TupleWrapper,
-    Datasource,
 )
-from trilogy.core.functions import argument_to_purpose, function_args_to_output_purpose
+from trilogy.dialect.base import BaseDialect
 from trilogy.parsing.parse_engine import (
     arg_to_datatype,
     parse_text,
 )
-from trilogy.constants import MagicConstants
-from trilogy.dialect.base import BaseDialect
-from trilogy.core.enums import BooleanOperator
-from trilogy import Dialects
 
 
 def test_in():
@@ -178,7 +177,9 @@ select
 """
     )
 
-    for name in ["name_alphabetical", "name_alphabetical_2"]:
+    for name in [
+        "name_alphabetical",
+    ]:
         assert f"local.{name}" in env.concepts
         assert env.concepts[name].purpose == Purpose.PROPERTY
         assert env.concepts[name].keys == (env.concepts["id"],)
@@ -206,7 +207,6 @@ select
 
 
 def test_output_purpose():
-
     env, parsed = parse_text(
         """key id int;
 property id.name string;
@@ -219,8 +219,10 @@ rowset test<- select
     row_number id order by name asc -> name_alphabetical_2
     ;
 
+auto test_name_count <- count(test.name);
+
 select 
-    count( test.name ) -> test_name_count;
+    test_name_count;
 """
     )
     # assert output_purpose == Purpose.METRIC
@@ -274,7 +276,6 @@ def test_the_comments():
 
 
 def test_purpose_nesting():
-
     env, parsed = parse_text(
         """key year int;
 """
@@ -434,7 +435,6 @@ const labels <- '';
 
 
 def test_struct_attr_access():
-
     text = """
 const labels <- struct(a=1, b=2, c=3);
 
@@ -459,7 +459,6 @@ select
 
 
 def test_datasource_colon():
-
     text = """
 key x int;
 key y int;
@@ -502,7 +501,6 @@ select x;
 
 
 def test_datasource_where_equivalent():
-
     text = """
 key x int;
 key y int;
@@ -524,7 +522,6 @@ address `abc:def`
 
 
 def test_datasource_quoted():
-
     text = """
 key x int;
 key y int;
@@ -546,7 +543,6 @@ address `abc:def`
 
 
 def test_datasource_from_persist():
-
     text = """
 key x int;
 key y int;
@@ -575,7 +571,6 @@ where y>10;
 
 
 def test_filter_concise():
-
     text = """
 key x int;
 key y int;

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_partial_handling.py

@@ -1,23 +1,21 @@
-from trilogy import Executor, Dialects
-
 # 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 (
-    DataType,
-    Datasource,
-    Concept,
     ColumnAssignment,
+    Concept,
+    Datasource,
+    DataType,
     Environment,
 )
-from trilogy.core.enums import Purpose
-
-
-from trilogy.core.query_processor import generate_graph
-from trilogy.core.processing.nodes import MergeNode
 from trilogy.core.processing.concept_strategies_v3 import search_concepts
 from trilogy.core.processing.node_generators import (
     gen_filter_node,
 )
+from trilogy.core.processing.nodes import MergeNode
+from trilogy.core.query_processor import generate_graph
 from trilogy.hooks.query_debugger import DebuggingHook
 
 

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_query_processing.py

@@ -1,6 +1,6 @@
-from trilogy.core.models import SelectStatement, QueryDatasource, Environment, Grain
+from trilogy.core.models import Environment, Grain, QueryDatasource, SelectStatement
 from trilogy.core.processing.concept_strategies_v3 import search_concepts
-from trilogy.core.query_processor import process_query, get_query_datasources
+from trilogy.core.query_processor import get_query_datasources, process_query
 
 
 def test_direct_select(test_environment, test_environment_graph):

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_select.py

@@ -1,6 +1,6 @@
 # from trilogy.compiler import compile
-from trilogy.core.models import Grain
-from trilogy.core.models import SelectStatement
+from trilogy import Dialects
+from trilogy.core.models import Grain, SelectStatement
 from trilogy.core.query_processor import process_query
 from trilogy.dialect.bigquery import BigqueryDialect
 from trilogy.parser import parse
@@ -32,6 +32,7 @@ datasource users (
     address `bigquery-public-data.stackoverflow.users`
 ;
 
+    auto post_count <- count(post_id);
 
     """
     env, parsed = parse(declarations)
@@ -40,7 +41,7 @@ datasource users (
     # a comment
     user_id,
     about_me,
-    count(post_id)->post_count
+    post_count
 ;"""
     env, parse_one = parse(q1, environment=env)
 
@@ -54,7 +55,10 @@ datasource users (
     env, parse_two = parse(q2, environment=env)
 
     select: SelectStatement = parse_two[-1]
-    assert select.grain == Grain(components=[env.concepts["about_me"]])
+    assert (
+        select.grain.components
+        == Grain(components=[env.concepts["about_me"]]).components
+    )
 
 
 def test_double_aggregate():
@@ -147,3 +151,28 @@ def test_having_without_select():
         assert "that is not in the select projection in the HAVING clause" in str(e)
         failed = True
     assert failed
+
+
+def test_local_select_concepts():
+    q1 = """
+
+key id int;
+datasource local (
+
+    id: id
+    )
+    grain (id)
+query '''
+
+SELECT 1 as id
+''';
+
+
+select id + 2 as three;
+
+"""
+
+    env, parsed = parse(q1)
+
+    result = Dialects.DUCK_DB.default_executor(environment=env).execute_text(q1)[-1]
+    assert result.fetchone().three == 3

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_statements.py

@@ -1,7 +1,8 @@
-from trilogy.parser import parse
+from pathlib import Path
+
 from trilogy import Dialects
 from trilogy.core.models import ProcessedCopyStatement
-from pathlib import Path
+from trilogy.parser import parse
 
 # from trilogy.compiler import compile
 

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_undefined_concept.py

@@ -1,6 +1,6 @@
 from trilogy.core.enums import Purpose
 from trilogy.core.exceptions import UndefinedConceptException
-from trilogy.core.models import DataType, EnvironmentConceptDict, Concept
+from trilogy.core.models import Concept, DataType, EnvironmentConceptDict
 from trilogy.parser import parse
 
 

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/tests/test_where_clause.py

@@ -1,9 +1,9 @@
 # from trilogy.compiler import compile
-from trilogy.core.models import SelectStatement, Grain, Parenthetical
+from trilogy.core.models import Grain, Parenthetical, SelectStatement
+from trilogy.core.processing.utility import is_scalar_condition
 from trilogy.core.query_processor import process_query
 from trilogy.dialect.base import BaseDialect
 from trilogy.parser import parse
-from trilogy.core.processing.utility import is_scalar_condition
 
 
 def test_select_where(test_environment):

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/trilogy/__init__.py

@@ -1,9 +1,9 @@
+from trilogy.constants import CONFIG
 from trilogy.core.models import Environment
 from trilogy.dialect.enums import Dialects
 from trilogy.executor import Executor
 from trilogy.parser import parse
-from trilogy.constants import CONFIG
 
-__version__ = "0.0.2.46"
+__version__ = "0.0.2.48"
 
 __all__ = ["parse", "Executor", "Dialects", "Environment", "CONFIG"]

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/trilogy/constants.py

@@ -1,7 +1,7 @@
-from logging import getLogger
+import random
 from dataclasses import dataclass, field
 from enum import Enum
-import random
+from logging import getLogger
 
 logger = getLogger("trilogy")
 
@@ -44,6 +44,7 @@ class Rendering:
     """Control how the SQL is rendered"""
 
     parameters: bool = True
+    concise: bool = False
 
 
 # TODO: support loading from environments
@@ -56,6 +57,7 @@ class Config:
     comments: Comments = field(default_factory=Comments)
     optimizations: Optimizations = field(default_factory=Optimizations)
     rendering: Rendering = field(default_factory=Rendering)
+    select_as_definition: bool = True
 
     @property
     def show_comments(self) -> bool:

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/trilogy/core/enums.py

@@ -29,6 +29,7 @@ class Purpose(Enum):
     METRIC = "metric"
     ROWSET = "rowset"
     AUTO = "auto"
+    UNKNOWN = "unknown"
 
     @classmethod
     def _missing_(cls, value):
@@ -44,6 +45,7 @@ class PurposeLineage(Enum):
     FILTER = "filter"
     CONSTANT = "constant"
     UNNEST = "unnest"
+    UNION = "union"
     ROOT = "root"
     ROWSET = "rowset"
     MULTISELECT = "multiselect"
@@ -113,6 +115,9 @@ class FunctionType(Enum):
 
     # structural
     UNNEST = "unnest"
+
+    UNION = "union"
+
     ALIAS = "alias"
 
     # Generic
@@ -133,6 +138,7 @@ class FunctionType(Enum):
 
     # TEXT AND MAYBE MORE
     SPLIT = "split"
+    LENGTH = "len"
 
     # Math
     DIVIDE = "divide"
@@ -154,7 +160,6 @@ class FunctionType(Enum):
     MAX = "max"
     MIN = "min"
     AVG = "avg"
-    LENGTH = "len"
 
     # String
     LIKE = "like"
@@ -299,6 +304,7 @@ class SourceType(Enum):
     ROWSET = "rowset"
     MERGE = "merge"
     BASIC = "basic"
+    UNION = "union"
 
 
 class ShowCategory(Enum):

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/trilogy/core/env_processor.py

@@ -3,7 +3,7 @@ from trilogy.core.graph_models import (
     concept_to_node,
     datasource_to_node,
 )
-from trilogy.core.models import Environment, Concept, Datasource
+from trilogy.core.models import Concept, Datasource, Environment
 
 
 def add_concept(
@@ -68,7 +68,6 @@ def generate_adhoc_graph(
 def generate_graph(
     environment: Environment,
 ) -> ReferenceGraph:
-
     return generate_adhoc_graph(
         list(environment.concepts.values())
         + list(environment.alias_origin_lookup.values()),

{pytrilogy-0.0.2.46 → pytrilogy-0.0.2.48}/trilogy/core/environment_helpers.py

@@ -1,15 +1,15 @@
+from trilogy.constants import DEFAULT_NAMESPACE
+from trilogy.core.enums import ConceptSource, FunctionType, Purpose
+from trilogy.core.functions import AttrAccess
 from trilogy.core.models import (
-    DataType,
     Concept,
+    DataType,
     Environment,
     Function,
     Metadata,
     StructType,
 )
-from trilogy.core.functions import AttrAccess
-from trilogy.core.enums import Purpose, FunctionType, ConceptSource
-from trilogy.constants import DEFAULT_NAMESPACE
-from trilogy.parsing.common import process_function_args, arg_to_datatype, Meta
+from trilogy.parsing.common import Meta, arg_to_datatype, process_function_args
 
 
 def generate_date_concepts(concept: Concept, environment: Environment):