pytrilogy 0.0.2.49__tar.gz → 0.0.2.51__tar.gz

{pytrilogy-0.0.2.49/pytrilogy.egg-info → pytrilogy-0.0.2.51}/PKG-INFO

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

{pytrilogy-0.0.2.49 → pytrilogy-0.0.2.51/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.2.49 → pytrilogy-0.0.2.51}/pytrilogy.egg-info/SOURCES.txt

@@ -73,6 +73,8 @@ 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/node_generators/select_helpers/__init__.py
+trilogy/core/processing/node_generators/select_helpers/datasource_injection.py
 trilogy/core/processing/nodes/__init__.py
 trilogy/core/processing/nodes/base_node.py
 trilogy/core/processing/nodes/filter_node.py

{pytrilogy-0.0.2.49 → pytrilogy-0.0.2.51}/tests/test_discovery_nodes.py

@@ -15,7 +15,6 @@ def test_group_node(test_environment, test_environment_graph):
         output_concepts=[total_revenue, category],
         input_concepts=[category, revenue],
         environment=test_environment,
-        g=test_environment_graph,
         parents=[
             search_concepts(
                 [category, revenue],

{pytrilogy-0.0.2.49 → pytrilogy-0.0.2.51}/tests/test_environment.py

@@ -7,9 +7,9 @@ from trilogy.core.models import Environment
 
 
 def test_environment_serialization(test_environment: Environment):
-    str(test_environment)
-    path = test_environment.to_cache()
 
+    path = test_environment.to_cache()
+    print(path)
     test_environment2 = Environment.from_cache(path)
     assert test_environment2
 

{pytrilogy-0.0.2.49 → pytrilogy-0.0.2.51}/tests/test_functions.py

@@ -1,8 +1,10 @@
 # from trilogy.compiler import compile
+from datetime import date, datetime
 from logging import INFO
 
 from pytest import raises
 
+from trilogy import Dialects
 from trilogy.constants import logger
 from trilogy.core.enums import Purpose, PurposeLineage
 from trilogy.core.exceptions import InvalidSyntaxException
@@ -154,6 +156,36 @@ def test_explicit_cast(test_environment):
         dialect.compile_statement(process_query(test_environment, select))
 
 
+def test_literal_cast(test_environment):
+    declarations = """
+select
+    '1'::int -> one,
+    '1'::float -> one_float,
+    '1'::string -> one_string,
+    '2024-01-01'::date -> one_date,
+    '2024-01-01 01:01:01'::datetime -> one_datetime,
+    'true'::bool -> one_bool,
+    ;"""
+    env, parsed = parse(declarations, environment=test_environment)
+
+    select: SelectStatement = parsed[-1]
+    z = (
+        Dialects.DUCK_DB.default_executor(environment=test_environment)
+        .execute_query(parsed[-1])
+        .fetchall()
+    )
+    assert z[0].one == 1
+    assert z[0].one_float == 1.0
+    assert z[0].one_string == "1"
+    assert z[0].one_date == date(year=2024, month=1, day=1)
+    assert z[0].one_datetime == datetime(
+        year=2024, month=1, day=1, hour=1, minute=1, second=1
+    )
+    assert z[0].one_bool
+    for dialect in TEST_DIALECTS:
+        dialect.compile_statement(process_query(test_environment, select))
+
+
 def test_math_functions(test_environment):
     declarations = """
     
@@ -210,6 +242,7 @@ def test_case_function(test_environment):
         test_upper_case
     ;"""
     env, parsed = parse(declarations, environment=test_environment)
+
     assert (
         test_environment.concepts["category_name"]
         in test_environment.concepts["test_upper_case"].lineage.concept_arguments

{pytrilogy-0.0.2.49 → pytrilogy-0.0.2.51}/tests/test_models.py

@@ -68,7 +68,7 @@ def test_cte_merge(test_environment, test_environment_graph):
 
 
 def test_concept(test_environment, test_environment_graph):
-    test_concept = list(test_environment.concepts.values())[0]
+    test_concept: Concept = list(test_environment.concepts.values())[0]
     new = test_concept.with_namespace("test")
     assert (
         new.namespace == ("test" + "." + test_concept.namespace)
@@ -129,7 +129,7 @@ def test_grain(test_environment):
     x = Grain(components=[oid, pid])
     y = Grain(components=[pid, cid])
     z = Grain(components=[cid])
-    z2 = Grain(components=[cid, cname])
+    z2 = Grain.from_concepts([cid, cname], environment=test_environment)
 
     assert x.intersection(y) == Grain(components=[pid])
     assert x.union(y) == Grain(components=[oid, pid, cid])
@@ -137,7 +137,9 @@ def test_grain(test_environment):
     assert z.isdisjoint(x)
     assert z.issubset(y)
 
-    assert z2 == z, f"Property should be removed from grain ({z.set}) vs {z2.set}"
+    assert (
+        z2 == z
+    ), f"Property should be removed from grain ({z.components}) vs {z2.components}"
 
 
 def test_select(test_environment: Environment):

{pytrilogy-0.0.2.49 → pytrilogy-0.0.2.51}/tests/test_query_processing.py

@@ -1,4 +1,10 @@
-from trilogy.core.models import Environment, Grain, QueryDatasource, SelectStatement
+from trilogy.core.models import (
+    Environment,
+    Grain,
+    QueryDatasource,
+    SelectStatement,
+    SourceType,
+)
 from trilogy.core.processing.concept_strategies_v3 import search_concepts
 from trilogy.core.query_processor import get_query_datasources, process_query
 
@@ -7,7 +13,7 @@ def test_direct_select(test_environment, test_environment_graph):
     product = test_environment.concepts["product_id"]
     #        concept, grain: Grain, environment: Environment, g: ReferenceGraph, query_graph: ReferenceGraph
     datasource = search_concepts(
-        [product] + product.grain.components_copy,
+        [product] + [test_environment.concepts[c] for c in product.grain.components],
         environment=test_environment,
         g=test_environment_graph,
         depth=0,
@@ -27,7 +33,8 @@ def test_get_datasource_from_window_function(
     #        concept, grain: Grain, environment: Environment, g: ReferenceGraph, query_graph: ReferenceGraph
     # assert product_rank.grain.components[0] == test_environment.concepts['name']
     node = search_concepts(
-        [product_rank] + product_rank.grain.components_copy,
+        [product_rank]
+        + [test_environment.concepts[c] for c in product_rank.grain.components],
         environment=test_environment,
         g=test_environment_graph,
         depth=0,
@@ -38,14 +45,18 @@ def test_get_datasource_from_window_function(
     assert product_rank in datasource.output_concepts
     # assert datasource.grain == product_rank.grain
     assert isinstance(datasource, QueryDatasource)
-    assert datasource.grain.set == product_rank.grain.set
+    assert datasource.grain.components == product_rank.grain.components
 
     product_rank_by_category = test_environment.concepts[
         "product_revenue_rank_by_category"
     ]
     #        concept, grain: Grain, environment: Environment, g: ReferenceGraph, query_graph: ReferenceGraph
     datasource = search_concepts(
-        [product_rank_by_category] + product_rank_by_category.grain.components_copy,
+        [product_rank_by_category]
+        + [
+            test_environment.concepts[c]
+            for c in product_rank_by_category.grain.components
+        ],
         environment=test_environment,
         g=test_environment_graph,
         depth=0,
@@ -68,7 +79,8 @@ def test_get_datasource_for_filter(
         "product_id",
     }
     datasource = search_concepts(
-        [hi_rev_product] + hi_rev_product.grain.components_copy,
+        [hi_rev_product]
+        + [test_environment.concepts[c] for c in hi_rev_product.grain.components],
         environment=test_environment,
         g=test_environment_graph,
         depth=0,
@@ -86,7 +98,7 @@ def test_select_output(test_environment, test_environment_graph):
     #        concept, grain: Grain, environment: Environment, g: ReferenceGraph, query_graph: ReferenceGraph
 
     datasource = search_concepts(
-        [product] + product.grain.components_copy,
+        [product] + [test_environment.concepts[c] for c in product.grain.components],
         environment=test_environment,
         g=test_environment_graph,
         depth=0,
@@ -114,18 +126,25 @@ def test_basic_aggregate(test_environment: Environment, test_environment_graph):
 
 
 def test_join_aggregate(test_environment: Environment, test_environment_graph):
+    from trilogy.hooks.query_debugger import DebuggingHook
+
+    DebuggingHook()
     category_id = test_environment.concepts["category_id"]
     total_revenue = test_environment.concepts["total_revenue"]
     #        concept, grain: Grain, environment: Environment, g: ReferenceGraph, query_graph: ReferenceGraph
     datasource = search_concepts(
-        [total_revenue.with_grain(category_id), category_id],
+        [
+            total_revenue.with_grain(Grain(components={"local.category_id"})),
+            category_id,
+        ],
         environment=test_environment,
         g=test_environment_graph,
         depth=0,
     ).resolve()
     assert isinstance(datasource, QueryDatasource)
+    assert datasource.source_type == SourceType.GROUP
     assert len(set([datasource.name for datasource in datasource.datasources])) == 1
-    assert datasource.grain.components == [category_id]
+    assert datasource.grain.components == {"local.category_id"}
 
 
 def test_query_aggregation(test_environment, test_environment_graph):

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

{pytrilogy-0.0.2.49 → pytrilogy-0.0.2.51}/trilogy/core/enums.py

@@ -120,6 +120,8 @@ class FunctionType(Enum):
 
     ALIAS = "alias"
 
+    PARENTHETICAL = "parenthetical"
+
     # Generic
     CASE = "case"
     CAST = "cast"
@@ -135,6 +137,8 @@ class FunctionType(Enum):
     ATTR_ACCESS = "attr_access"
     STRUCT = "struct"
     ARRAY = "array"
+    DATE_LITERAL = "date_literal"
+    DATETIME_LITERAL = "datetime_literal"
 
     # TEXT AND MAYBE MORE
     SPLIT = "split"
@@ -260,6 +264,13 @@ class ComparisonOperator(Enum):
     CONTAINS = "contains"
     ELSE = "else"
 
+    def __eq__(self, other):
+        if isinstance(other, str):
+            return self.value == other
+        if not isinstance(other, ComparisonOperator):
+            return False
+        return self.value == other.value
+
     @classmethod
     def _missing_(cls, value):
         if not isinstance(value, list) and " " in str(value):

{pytrilogy-0.0.2.49 → pytrilogy-0.0.2.51}/trilogy/core/functions.py

@@ -1,3 +1,4 @@
+from datetime import date, datetime
 from typing import Optional
 
 from trilogy.constants import MagicConstants
@@ -17,6 +18,8 @@ from trilogy.core.models import (
     arg_to_datatype,
 )
 
+GENERIC_ARGS = Concept | Function | str | int | float | date | datetime
+
 
 def create_function_derived_concept(
     name: str,
@@ -262,7 +265,7 @@ def get_attr_datatype(
     return arg.datatype
 
 
-def AttrAccess(args: list[Concept]):
+def AttrAccess(args: list[GENERIC_ARGS]):
     return Function(
         operator=FunctionType.ATTR_ACCESS,
         arguments=args,

{pytrilogy-0.0.2.49 → pytrilogy-0.0.2.51}/trilogy/core/internal.py

@@ -1,6 +1,6 @@
 from trilogy.core.constants import ALL_ROWS_CONCEPT, INTERNAL_NAMESPACE
 from trilogy.core.enums import FunctionType, Purpose
-from trilogy.core.models import Concept, DataType, Function
+from trilogy.core.models import Concept, DataType, Function, Grain
 
 DEFAULT_CONCEPTS = {
     ALL_ROWS_CONCEPT: Concept(
@@ -8,6 +8,7 @@ DEFAULT_CONCEPTS = {
         namespace=INTERNAL_NAMESPACE,
         datatype=DataType.INTEGER,
         purpose=Purpose.CONSTANT,
+        grain=Grain(),
         lineage=Function(
             operator=FunctionType.CONSTANT,
             arguments=[1],
@@ -20,17 +21,20 @@ DEFAULT_CONCEPTS = {
         namespace=INTERNAL_NAMESPACE,
         datatype=DataType.STRING,
         purpose=Purpose.KEY,
+        grain=Grain(),
     ),
     "datasource": Concept(
         name="datasource",
         namespace=INTERNAL_NAMESPACE,
         datatype=DataType.STRING,
         purpose=Purpose.KEY,
+        grain=Grain(),
     ),
     "query_text": Concept(
         name="query_text",
         namespace=INTERNAL_NAMESPACE,
         datatype=DataType.STRING,
         purpose=Purpose.KEY,
+        grain=Grain(),
     ),
 }