pytrilogy 0.0.3.57__tar.gz → 0.0.3.60__tar.gz

{pytrilogy-0.0.3.57/pytrilogy.egg-info → pytrilogy-0.0.3.60}/PKG-INFO

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

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60}/pytrilogy.egg-info/SOURCES.txt

@@ -143,4 +143,5 @@ trilogy/std/display.preql
 trilogy/std/geography.preql
 trilogy/std/money.preql
 trilogy/std/net.preql
+trilogy/std/ranking.preql
 trilogy/std/report.preql

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

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60}/trilogy/core/constants.py

@@ -2,3 +2,4 @@ CONSTANT_DATASET: str = "preql_internal_constant_dataset"
 ALL_ROWS_CONCEPT = "all_rows"
 INTERNAL_NAMESPACE = "__preql_internal"
 PERSISTED_CONCEPT_PREFIX = "__pre_persist"
+UNNEST_NAME = "_unnest_alias"

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60}/trilogy/core/enums.py

@@ -7,6 +7,7 @@ class UnnestMode(Enum):
     DIRECT = "direct"
     CROSS_APPLY = "cross_apply"
     CROSS_JOIN = "cross_join"
+    CROSS_JOIN_UNNEST = "cross_join_unnest"
     CROSS_JOIN_ALIAS = "cross_join_alias"
     SNOWFLAKE = "snowflake"
 

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60}/trilogy/core/processing/discovery_node_factory.py

@@ -373,7 +373,7 @@ class RootNodeHandler:
     ) -> Optional[StrategyNode]:
         logger.info(
             f"{depth_to_prefix(self.ctx.depth)}{LOGGER_PREFIX} "
-            f"Could not resolve root concepts, checking for synonyms"
+            f"Could not resolve root concepts, checking for synonyms for {root_targets}"
         )
 
         if not self.ctx.history.check_started(

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60}/trilogy/core/processing/node_generators/node_merge_node.py

@@ -88,7 +88,10 @@ def determine_induced_minimal_nodes(
     for node in G.nodes:
         if concepts.get(node):
             lookup: BuildConcept = concepts[node]
-            if lookup.derivation in (Derivation.CONSTANT,):
+            # inclusion of aggregates can create ambiguous node relation chains
+            # there may be a better way to handle this
+            # can be revisited if we need to connect a derived synonym based on an aggregate
+            if lookup.derivation in (Derivation.CONSTANT, Derivation.AGGREGATE):
                 nodes_to_remove.append(node)
             # purge a node if we're already looking for all it's parents
             if filter_downstream and lookup.derivation not in (Derivation.ROOT,):
@@ -112,6 +115,7 @@ def determine_induced_minimal_nodes(
         return None
     H.remove_nodes_from(list(x for x in H.nodes if x not in paths))
     sG: nx.Graph = ax.steinertree.steiner_tree(H, nodelist).copy()
+    logger.debug("Steiner tree found for nodes %s", nodelist)
     final: nx.DiGraph = nx.subgraph(G, sG.nodes).copy()
 
     for edge in G.edges:
@@ -228,11 +232,14 @@ def resolve_weak_components(
     # to ensure there are not ambiguous discovery paths
     # (if we did not care about raising ambiguity errors, we could just use the first one)
     count = 0
-    node_list = [
-        concept_to_node(c.with_default_grain())
-        for c in all_concepts
-        if "__preql_internal" not in c.address
-    ]
+    node_list = sorted(
+        [
+            concept_to_node(c.with_default_grain())
+            for c in all_concepts
+            if "__preql_internal" not in c.address
+        ]
+    )
+    logger.debug(f"Resolving weak components for {node_list} in {search_graph.nodes}")
     synonyms: set[str] = set()
     for x in all_concepts:
         synonyms = synonyms.union(x.pseudonyms)
@@ -354,7 +361,7 @@ def subgraphs_to_merge_node(
         parents.append(parent)
     input_c = []
     for x in parents:
-        for y in x.output_concepts:
+        for y in x.usable_outputs:
             input_c.append(y)
     if len(parents) == 1 and enable_early_exit:
         logger.info(
@@ -392,6 +399,7 @@ def gen_merge_node(
         )
     else:
         all_search_concepts = all_concepts
+    all_search_concepts = sorted(all_search_concepts, key=lambda x: x.address)
     for filter_downstream in [True, False]:
         weak_resolve = resolve_weak_components(
             all_search_concepts,

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60}/trilogy/dialect/base.py

@@ -10,6 +10,7 @@ from trilogy.constants import (
     Rendering,
     logger,
 )
+from trilogy.core.constants import UNNEST_NAME
 from trilogy.core.enums import (
     DatePart,
     FunctionType,
@@ -756,6 +757,16 @@ class BaseDialect:
                 f"{self.QUOTE_CHARACTER}{c.safe_address}{self.QUOTE_CHARACTER}"
                 for c in cte.join_derived_concepts
             ]
+        elif self.UNNEST_MODE == UnnestMode.CROSS_JOIN_UNNEST:
+            select_columns = [
+                self.render_concept_sql(c, cte)
+                for c in cte.output_columns
+                if c.address not in [y.address for y in cte.join_derived_concepts]
+                and c.address not in cte.hidden_concepts
+            ] + [
+                f"{UNNEST_NAME} as {self.QUOTE_CHARACTER}{c.safe_address}{self.QUOTE_CHARACTER}"
+                for c in cte.join_derived_concepts
+            ]
         else:
             # otherwse, assume we are unnesting directly in the select
             select_columns = [
@@ -770,11 +781,18 @@ class BaseDialect:
             if len(cte.joins) > 0:
                 if cte.join_derived_concepts and self.UNNEST_MODE in (
                     UnnestMode.CROSS_JOIN_ALIAS,
+                    # UnnestMode.CROSS_JOIN_UNNEST,
                     UnnestMode.CROSS_JOIN,
                     UnnestMode.CROSS_APPLY,
                 ):
 
                     source = f"{render_unnest(self.UNNEST_MODE, self.QUOTE_CHARACTER, cte.join_derived_concepts[0], self.render_expr, cte)}"
+                elif (
+                    cte.join_derived_concepts
+                    and self.UNNEST_MODE == UnnestMode.CROSS_JOIN_UNNEST
+                ):
+                    source = f"{self.render_expr(cte.join_derived_concepts[0], cte)} as {self.QUOTE_CHARACTER}{UNNEST_NAME}{self.QUOTE_CHARACTER}"
+
                 elif (
                     cte.join_derived_concepts
                     and self.UNNEST_MODE == UnnestMode.SNOWFLAKE

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60}/trilogy/dialect/bigquery.py

@@ -22,7 +22,7 @@ FUNCTION_MAP = {
     FunctionType.MINUTE: lambda x: f"EXTRACT(MINUTE from {x[0]})",
     FunctionType.SECOND: lambda x: f"EXTRACT(SECOND from {x[0]})",
     FunctionType.HOUR: lambda x: f"EXTRACT(HOUR from {x[0]})",
-    FunctionType.DAY_OF_WEEK: lambda x: f"EXTRACT(DAYOFWEEK from {x[0]})",
+    FunctionType.DAY_OF_WEEK: lambda x: f"EXTRACT(DAYOFWEEK from {x[0]})-1",  # BigQuery's DAYOFWEEK returns 1 for Sunday
     FunctionType.DAY: lambda x: f"EXTRACT(DAY from {x[0]})",
     FunctionType.YEAR: lambda x: f"EXTRACT(YEAR from {x[0]})",
     FunctionType.MONTH: lambda x: f"EXTRACT(MONTH from {x[0]})",
@@ -97,5 +97,5 @@ class BigqueryDialect(BaseDialect):
     }
     QUOTE_CHARACTER = "`"
     SQL_TEMPLATE = BQ_SQL_TEMPLATE
-    UNNEST_MODE = UnnestMode.CROSS_JOIN
+    UNNEST_MODE = UnnestMode.CROSS_JOIN_UNNEST
     DATATYPE_MAP = DATATYPE_MAP

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60}/trilogy/dialect/common.py

@@ -1,5 +1,6 @@
 from typing import Callable
 
+from trilogy.core.constants import UNNEST_NAME
 from trilogy.core.enums import Modifier, UnnestMode
 from trilogy.core.models.build import (
     BuildComparison,
@@ -34,11 +35,14 @@ def render_unnest(
     cte: CTE,
 ):
     if not isinstance(concept, (BuildConcept, BuildParamaterizedConceptReference)):
-        address = "anon_function"
+        print(type(concept))
+        address = UNNEST_NAME
     else:
         address = concept.safe_address
     if unnest_mode == UnnestMode.CROSS_JOIN:
         return f"{render_func(concept, cte)} as {quote_character}{address}{quote_character}"
+    elif unnest_mode == UnnestMode.CROSS_JOIN_UNNEST:
+        return f"unnest({render_func(concept, cte)}) as {quote_character}{address}{quote_character}"
     elif unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
         return f"{render_func(concept, cte)} as unnest_wrapper ({quote_character}{address}{quote_character})"
     elif unnest_mode == UnnestMode.SNOWFLAKE:
@@ -95,9 +99,11 @@ def render_join(
             return None
         if not cte:
             raise ValueError("must provide a cte to build an unnest joins")
-        if unnest_mode == UnnestMode.CROSS_JOIN:
-            return f"CROSS JOIN {render_unnest(unnest_mode, quote_character, join.object_to_unnest, render_expr_func, cte)}"
-        if unnest_mode == UnnestMode.CROSS_JOIN_ALIAS:
+        if unnest_mode in (
+            UnnestMode.CROSS_JOIN,
+            UnnestMode.CROSS_JOIN_UNNEST,
+            UnnestMode.CROSS_JOIN_ALIAS,
+        ):
             return f"CROSS JOIN {render_unnest(unnest_mode, quote_character, join.object_to_unnest, render_expr_func, cte)}"
         if unnest_mode == UnnestMode.SNOWFLAKE:
             return f"LEFT JOIN LATERAL {render_unnest(unnest_mode, quote_character, join.object_to_unnest, render_expr_func, cte)}"

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60}/trilogy/parsing/common.py

@@ -38,6 +38,7 @@ from trilogy.core.models.author import (
     Parenthetical,
     RowsetItem,
     RowsetLineage,
+    TraitDataType,
     UndefinedConcept,
     WhereClause,
     WindowItem,
@@ -608,6 +609,9 @@ def window_item_to_concept(
                 and set([x.address for x in item.expr.by]) == keys
             ):
                 continue
+            elif isinstance(item.expr, AggregateWrapper):
+
+                grain_components += item.expr.by
             else:
                 grain_components += item.concept_arguments
     else:
@@ -617,19 +621,20 @@ def window_item_to_concept(
     modifiers = get_upstream_modifiers(bcontent.concept_arguments, environment)
     datatype = parent.content.datatype
     if parent.type in (
-        WindowType.RANK,
+        # WindowType.RANK,
         WindowType.ROW_NUMBER,
         WindowType.COUNT,
         WindowType.COUNT_DISTINCT,
     ):
         datatype = DataType.INTEGER
+    if parent.type == WindowType.RANK:
+        datatype = TraitDataType(type=DataType.INTEGER, traits=["rank"])
     return Concept(
         name=name,
         datatype=datatype,
         purpose=local_purpose,
         lineage=parent,
         metadata=fmetadata,
-        # filters are implicitly at the grain of the base item
         grain=final_grain,
         namespace=namespace,
         keys=keys,

{pytrilogy-0.0.3.57 → pytrilogy-0.0.3.60}/trilogy/std/date.preql

@@ -2,9 +2,12 @@
 
 type year int;
 type month int;
+type month_name string;
 type week int;
 type day int;
 type hour int;
 type minute int;
 type second int;
-type day_of_week int;
+type day_of_week int;
+type day_of_week_name string;
+

pytrilogy-0.0.3.60/trilogy/std/ranking.preql

@@ -0,0 +1,6 @@
+
+type rank int;
+type score int;
+type position int;
+type index int;
+type grade int;