pytrilogy 0.0.2.48__tar.gz → 0.0.2.50__tar.gz

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

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

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

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

{pytrilogy-0.0.2.48 → pytrilogy-0.0.2.50}/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.48 → pytrilogy-0.0.2.50}/tests/test_functions.py

@@ -14,6 +14,8 @@ from trilogy.dialect.duckdb import DuckDBDialect
 from trilogy.dialect.snowflake import SnowflakeDialect
 from trilogy.dialect.sql_server import SqlServerDialect
 from trilogy.parser import parse
+from trilogy import Dialects
+from datetime import date, datetime
 
 logger.setLevel(INFO)
 
@@ -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 == True
+    for dialect in TEST_DIALECTS:
+        dialect.compile_statement(process_query(test_environment, select))
+
+
 def test_math_functions(test_environment):
     declarations = """
     

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

@@ -130,9 +130,7 @@ def test_join_aggregate(test_environment: Environment, test_environment_graph):
 
 def test_query_aggregation(test_environment, test_environment_graph):
     select = SelectStatement(selection=[test_environment.concepts["total_revenue"]])
-    datasource = get_query_datasources(
-        environment=test_environment, graph=test_environment_graph, statement=select
-    )
+    datasource = get_query_datasources(environment=test_environment, statement=select)
 
     assert {datasource.identifier} == {"revenue_at_local_order_id_at_abstract"}
     check = datasource
@@ -150,9 +148,7 @@ def test_query_datasources(test_environment, test_environment_graph):
             test_environment.concepts["total_revenue"],
         ]
     )
-    get_query_datasources(
-        environment=test_environment, graph=test_environment_graph, statement=select
-    )
+    get_query_datasources(environment=test_environment, statement=select)
 
 
 def test_full_query(test_environment, test_environment_graph):

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

{pytrilogy-0.0.2.48 → pytrilogy-0.0.2.50}/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.48 → pytrilogy-0.0.2.50}/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.48 → pytrilogy-0.0.2.50}/trilogy/core/models.py

@@ -5,6 +5,7 @@ import hashlib
 import os
 from abc import ABC
 from collections import UserDict, UserList, defaultdict
+from datetime import date, datetime
 from enum import Enum
 from functools import cached_property
 from pathlib import Path
@@ -467,7 +468,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
         )
 
     def __repr__(self):
-        base = f"{self.namespace}.{self.address}@{self.grain}"
+        base = f"{self.address}@{self.grain}"
         return base
 
     @property
@@ -662,11 +663,24 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
                 local_concepts=local_concepts, grain=grain, environment=environment
             )
         final_grain = self.grain
-
+        keys = (
+            tuple(
+                [
+                    x.with_select_context(local_concepts, grain, environment)
+                    for x in self.keys
+                ]
+            )
+            if self.keys
+            else None
+        )
         if self.is_aggregate and isinstance(new_lineage, Function):
             new_lineage = AggregateWrapper(function=new_lineage, by=grain.components)
             final_grain = grain
-
+            keys = tuple(grain.components)
+        elif (
+            self.is_aggregate and not keys and isinstance(new_lineage, AggregateWrapper)
+        ):
+            keys = tuple(new_lineage.by)
         return self.__class__(
             name=self.name,
             datatype=self.datatype,
@@ -675,16 +689,7 @@ class Concept(Mergeable, Namespaced, SelectContext, BaseModel):
             lineage=new_lineage,
             grain=final_grain,
             namespace=self.namespace,
-            keys=(
-                tuple(
-                    [
-                        x.with_select_context(local_concepts, grain, environment)
-                        for x in self.keys
-                    ]
-                )
-                if self.keys
-                else None
-            ),
+            keys=keys,
             modifiers=self.modifiers,
             # a select needs to always defer to the environment for pseudonyms
             # TODO: evaluate if this should be cached
@@ -1260,6 +1265,8 @@ class Function(Mergeable, Namespaced, SelectContext, BaseModel):
             int,
             float,
             str,
+            date,
+            datetime,
             MapWrapper[Any, Any],
             DataType,
             ListType,
@@ -2626,7 +2633,7 @@ class QueryDatasource(BaseModel):
                     and CONFIG.validate_missing
                 ):
                     raise SyntaxError(
-                        f"Missing source map for {concept.address} on {key}, have {v}"
+                        f"On query datasource missing source map for {concept.address} on {key}, have {v}"
                     )
         return v
 
@@ -3864,6 +3871,8 @@ class Comparison(
         float,
         list,
         bool,
+        datetime,
+        date,
         Function,
         Concept,
         "Conditional",
@@ -3880,6 +3889,8 @@ class Comparison(
         float,
         list,
         bool,
+        date,
+        datetime,
         Concept,
         Function,
         "Conditional",
@@ -5004,5 +5015,9 @@ def arg_to_datatype(arg) -> DataType | ListType | StructType | MapType | Numeric
         return ListType(type=wrapper.type)
     elif isinstance(arg, MapWrapper):
         return MapType(key_type=arg.key_type, value_type=arg.value_type)
+    elif isinstance(arg, datetime):
+        return DataType.DATETIME
+    elif isinstance(arg, date):
+        return DataType.DATE
     else:
         raise ValueError(f"Cannot parse arg datatype for arg of raw type {type(arg)}")

{pytrilogy-0.0.2.48 → pytrilogy-0.0.2.50}/trilogy/core/processing/concept_strategies_v3.py

@@ -359,7 +359,6 @@ def generate_node(
             input_concepts=[],
             output_concepts=constant_targets,
             environment=environment,
-            g=g,
             parents=[],
             depth=depth + 1,
         )
@@ -569,6 +568,8 @@ def validate_stack(
         resolved = node.resolve()
 
         for concept in resolved.output_concepts:
+            if concept in resolved.hidden_concepts:
+                continue
             validate_concept(
                 concept,
                 node,
@@ -836,6 +837,7 @@ def _search_concepts(
                     PurposeLineage.ROWSET,
                     PurposeLineage.BASIC,
                     PurposeLineage.MULTISELECT,
+                    PurposeLineage.UNION,
                 ]:
                     skip.add(priority_concept.address)
                 break
@@ -903,7 +905,6 @@ def _search_concepts(
                 input_concepts=non_virtual,
                 output_concepts=non_virtual,
                 environment=environment,
-                g=g,
                 parents=stack,
                 depth=depth,
             )
@@ -984,7 +985,6 @@ def source_query_concepts(
             x for x in root.output_concepts if x.address not in root.hidden_concepts
         ],
         environment=environment,
-        g=g,
         parents=[root],
         partial_concepts=root.partial_concepts,
     )

{pytrilogy-0.0.2.48 → pytrilogy-0.0.2.50}/trilogy/core/processing/node_generators/common.py

@@ -130,7 +130,6 @@ def gen_property_enrichment_node(
         ),
         output_concepts=base_node.output_concepts + extra_properties,
         environment=environment,
-        g=g,
         parents=[
             base_node,
         ]
@@ -209,7 +208,6 @@ def gen_enrichment_node(
         input_concepts=unique(join_keys + extra_required + non_hidden, "address"),
         output_concepts=unique(join_keys + extra_required + non_hidden, "address"),
         environment=environment,
-        g=g,
         parents=[enrich_node, base_node],
         force_group=False,
         preexisting_conditions=conditions.conditional if conditions else None,

{pytrilogy-0.0.2.48 → pytrilogy-0.0.2.50}/trilogy/core/processing/node_generators/filter_node.py

@@ -117,7 +117,6 @@ def gen_filter_node(
                 input_concepts=row_parent.output_concepts,
                 output_concepts=[concept] + row_parent.output_concepts,
                 environment=row_parent.environment,
-                g=row_parent.g,
                 parents=[row_parent],
                 depth=row_parent.depth,
                 partial_concepts=row_parent.partial_concepts,
@@ -161,7 +160,6 @@ def gen_filter_node(
             ),
             output_concepts=[concept, immediate_parent] + parent_row_concepts,
             environment=environment,
-            g=g,
             parents=core_parents,
             grain=Grain(
                 components=[immediate_parent] + parent_row_concepts,
@@ -202,7 +200,6 @@ def gen_filter_node(
         ]
         + local_optional,
         environment=environment,
-        g=g,
         parents=[
             # this node fetches only what we need to filter
             filter_node,

{pytrilogy-0.0.2.48 → pytrilogy-0.0.2.50}/trilogy/core/processing/node_generators/group_node.py

@@ -100,7 +100,6 @@ def gen_group_node(
         output_concepts=output_concepts,
         input_concepts=parent_concepts,
         environment=environment,
-        g=g,
         parents=parents,
         depth=depth,
         preexisting_conditions=conditions.conditional if conditions else None,

{pytrilogy-0.0.2.48 → pytrilogy-0.0.2.50}/trilogy/core/processing/node_generators/group_to_node.py

@@ -45,7 +45,6 @@ def gen_group_to_node(
         output_concepts=parent_concepts + [concept],
         input_concepts=parent_concepts,
         environment=environment,
-        g=g,
         parents=parents,
         depth=depth,
     )
@@ -76,7 +75,6 @@ def gen_group_to_node(
         + [x for x in parent_concepts if x.address != concept.address],
         output_concepts=[concept] + local_optional,
         environment=environment,
-        g=g,
         parents=[
             # this node gets the group
             group_node,

{pytrilogy-0.0.2.48 → pytrilogy-0.0.2.50}/trilogy/core/processing/node_generators/multiselect_node.py

@@ -108,7 +108,6 @@ def gen_multiselect_node(
         input_concepts=[x for y in base_parents for x in y.output_concepts],
         output_concepts=[x for y in base_parents for x in y.output_concepts],
         environment=environment,
-        g=g,
         depth=depth,
         parents=base_parents,
         node_joins=node_joins,
@@ -178,7 +177,6 @@ def gen_multiselect_node(
         input_concepts=enrich_node.output_concepts + node.output_concepts,
         output_concepts=node.output_concepts + local_optional,
         environment=environment,
-        g=g,
         depth=depth,
         parents=[
             # this node gets the multiselect

{pytrilogy-0.0.2.48 → pytrilogy-0.0.2.50}/trilogy/core/processing/node_generators/node_merge_node.py

@@ -333,7 +333,6 @@ def subgraphs_to_merge_node(
         input_concepts=unique(input_c, "address"),
         output_concepts=[x for x in all_concepts],
         environment=environment,
-        g=g,
         parents=parents,
         depth=depth,
         # conditions=conditions,

{pytrilogy-0.0.2.48 → pytrilogy-0.0.2.50}/trilogy/core/processing/node_generators/rowset_node.py

@@ -38,7 +38,7 @@ def gen_rowset_node(
     rowset: RowsetDerivationStatement = lineage.rowset
     select: SelectStatement | MultiSelectStatement = lineage.rowset.select
 
-    node = get_query_node(environment, select, graph=g, history=history)
+    node = get_query_node(environment, select)
 
     if not node:
         logger.info(
@@ -94,15 +94,22 @@ def gen_rowset_node(
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} no enrichment required for rowset node as all optional found or no optional; exiting early."
         )
-        # node.set_preexisting_conditions(conditions.conditional if conditions else None)
         return node
-
-    possible_joins = concept_to_relevant_joins(node.output_concepts)
+    possible_joins = concept_to_relevant_joins(
+        [x for x in node.output_concepts if x.derivation != PurposeLineage.ROWSET]
+    )
+    logger.info({x.address: x.keys for x in possible_joins})
     if not possible_joins:
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} no possible joins for rowset node to get {[x.address for x in local_optional]}; have {[x.address for x in node.output_concepts]}"
         )
         return node
+    if any(x.derivation == PurposeLineage.ROWSET for x in possible_joins):
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} cannot enrich rowset node with rowset concepts; exiting early"
+        )
+        return node
+    logger.info([x.address for x in possible_joins + local_optional])
     enrich_node: MergeNode = source_concepts(  # this fetches the parent + join keys
         # to then connect to the rest of the query
         mandatory_list=possible_joins + local_optional,
@@ -110,22 +117,34 @@ def gen_rowset_node(
         g=g,
         depth=depth + 1,
         conditions=conditions,
+        history=history,
     )
     if not enrich_node:
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} Cannot generate rowset enrichment node for {concept} with optional {local_optional}, returning just rowset node"
         )
         return node
+
+    non_hidden = [
+        x for x in node.output_concepts if x.address not in node.hidden_concepts
+    ]
+    for x in possible_joins:
+        if x.address in node.hidden_concepts:
+            node.unhide_output_concepts([x])
+    non_hidden_enrich = [
+        x
+        for x in enrich_node.output_concepts
+        if x.address not in enrich_node.hidden_concepts
+    ]
     return MergeNode(
-        input_concepts=enrich_node.output_concepts + node.output_concepts,
-        output_concepts=node.output_concepts + local_optional,
+        input_concepts=non_hidden + non_hidden_enrich,
+        output_concepts=non_hidden + local_optional,
         environment=environment,
-        g=g,
         depth=depth,
         parents=[
             node,
             enrich_node,
         ],
-        partial_concepts=node.partial_concepts,
+        partial_concepts=node.partial_concepts + enrich_node.partial_concepts,
         preexisting_conditions=conditions.conditional if conditions else None,
     )