pytrilogy 0.0.3.106__tar.gz → 0.0.3.108__tar.gz

{pytrilogy-0.0.3.106/pytrilogy.egg-info → pytrilogy-0.0.3.108}/PKG-INFO

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

{pytrilogy-0.0.3.106 → pytrilogy-0.0.3.108/pytrilogy.egg-info}/PKG-INFO

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

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

{pytrilogy-0.0.3.106 → pytrilogy-0.0.3.108}/trilogy/core/processing/concept_strategies_v3.py

@@ -350,9 +350,6 @@ def check_for_early_exit(
 def generate_loop_completion(context: LoopContext, virtual: set[str]) -> StrategyNode:
     condition_required = True
     non_virtual = [c for c in context.completion_mandatory if c.address not in virtual]
-    non_virtual_output = [
-        c for c in context.original_mandatory if c.address not in virtual
-    ]
     non_virtual_different = len(context.completion_mandatory) != len(
         context.original_mandatory
     )
@@ -380,11 +377,12 @@ def generate_loop_completion(context: LoopContext, virtual: set[str]) -> Strateg
         logger.info(
             f"Condition {context.conditions} not required, parents included filtering! {parent_map}"
         )
+
     if len(context.stack) == 1:
         output: StrategyNode = context.stack[0]
         if non_virtual_different:
             logger.info(
-                f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Found different non-virtual output concepts ({non_virtual_difference_values}), removing condition injected values by setting outputs to {[x.address for x in output.output_concepts if x.address in non_virtual_output]}"
+                f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Found added non-virtual output concepts ({non_virtual_difference_values})"
             )
             # output.set_output_concepts(
             #     [
@@ -398,13 +396,6 @@ def generate_loop_completion(context: LoopContext, virtual: set[str]) -> Strateg
             # )
             # output.set_output_concepts(context.original_mandatory)
 
-            # if isinstance(output, MergeNode):
-            #     output.force_group = True
-            #     output.rebuild_cache()
-
-        logger.info(
-            f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Source stack has single node, returning that {type(output)}"
-        )
     else:
         logger.info(
             f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} wrapping multiple parent nodes {[type(x) for x in context.stack]} in merge node"
@@ -441,10 +432,18 @@ def generate_loop_completion(context: LoopContext, virtual: set[str]) -> Strateg
             f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Conditions {context.conditions} were injected, checking if we need a group to restore grain"
         )
         return group_if_required_v2(
-            output, context.original_mandatory, context.environment
+            output,
+            context.original_mandatory,
+            context.environment,
+            non_virtual_difference_values,
         )
 
-    return group_if_required_v2(output, context.original_mandatory, context.environment)
+    return group_if_required_v2(
+        output,
+        context.original_mandatory,
+        context.environment,
+        non_virtual_difference_values,
+    )
 
 
 def _search_concepts(

{pytrilogy-0.0.3.106 → pytrilogy-0.0.3.108}/trilogy/core/processing/discovery_utility.py

@@ -180,8 +180,12 @@ def check_if_group_required(
 
 
 def group_if_required_v2(
-    root: StrategyNode, final: List[BuildConcept], environment: BuildEnvironment
+    root: StrategyNode,
+    final: List[BuildConcept],
+    environment: BuildEnvironment,
+    where_injected: set[str] | None = None,
 ):
+    where_injected = where_injected or set()
     required = check_if_group_required(
         downstream_concepts=final, parents=[root.resolve()], environment=environment
     )
@@ -197,8 +201,23 @@ def group_if_required_v2(
             root.rebuild_cache()
             return root
         elif isinstance(root, GroupNode):
-            # root.set_output_concepts(final, rebuild=False)
-            # root.rebuild_cache()
+
+            if set(x.address for x in final) != set(
+                x.address for x in root.output_concepts
+            ):
+                allowed_outputs = [
+                    x
+                    for x in root.output_concepts
+                    if not (
+                        x.address in where_injected
+                        and x.address not in (root.required_outputs or set())
+                    )
+                ]
+
+                logger.info(
+                    f"Adjusting group node outputs to remove injected concepts {where_injected}: remaining {allowed_outputs}"
+                )
+                root.set_output_concepts(allowed_outputs)
             return root
         return GroupNode(
             output_concepts=targets,

{pytrilogy-0.0.3.106 → pytrilogy-0.0.3.108}/trilogy/core/processing/node_generators/group_node.py

@@ -176,6 +176,7 @@ def gen_group_node(
         parents=parents,
         depth=depth,
         preexisting_conditions=conditions.conditional if conditions else None,
+        required_outputs=parent_concepts,
     )
 
     # early exit if no optional

{pytrilogy-0.0.3.106 → pytrilogy-0.0.3.108}/trilogy/core/processing/node_generators/select_merge_node.py

@@ -416,17 +416,22 @@ def create_datasource_node(
 ) -> tuple[StrategyNode, bool]:
 
     target_grain = BuildGrain.from_concepts(all_concepts, environment=environment)
+    # datasource grain may have changed since reference graph creation
+    datasource_grain = BuildGrain.from_concepts(
+        datasource.grain.components, environment=environment
+    )
+    # datasource_grain = datasource.grain
     force_group = False
-    if not datasource.grain.issubset(target_grain):
+    if not datasource_grain.issubset(target_grain):
         logger.info(
-            f"{padding(depth)}{LOGGER_PREFIX}_DS_NODE Select node must be wrapped in group, {datasource.grain} not subset of target grain {target_grain}"
+            f"{padding(depth)}{LOGGER_PREFIX}_DS_NODE Select node must be wrapped in group, {datasource_grain} not subset of target grain {target_grain} from {all_concepts}"
         )
         force_group = True
     else:
         logger.info(
-            f"{padding(depth)}{LOGGER_PREFIX}_DS_NODE Select node grain {datasource.grain} is subset of target grain {target_grain}, no group required"
+            f"{padding(depth)}{LOGGER_PREFIX}_DS_NODE Select node grain {datasource_grain} is subset of target grain {target_grain}, no group required"
         )
-    if not datasource.grain.components:
+    if not datasource_grain.components:
         force_group = True
     partial_concepts = [
         c.concept

{pytrilogy-0.0.3.106 → pytrilogy-0.0.3.108}/trilogy/core/processing/node_generators/window_node.py

@@ -27,7 +27,7 @@ WINDOW_TYPES = (BuildWindowItem,)
 
 
 def resolve_window_parent_concepts(
-    concept: BuildConcept, environment: BuildEnvironment
+    concept: BuildConcept, environment: BuildEnvironment, depth: int
 ) -> tuple[BuildConcept, List[BuildConcept]]:
     if not isinstance(concept.lineage, WINDOW_TYPES):
         raise ValueError
@@ -39,7 +39,9 @@ def resolve_window_parent_concepts(
             base += item.concept_arguments
     if concept.grain:
         for gitem in concept.grain.components:
-            logger.info(f"{LOGGER_PREFIX} appending grain item {gitem} to base")
+            logger.info(
+                f"{padding(depth)}{LOGGER_PREFIX} appending grain item {gitem} to base"
+            )
             base.append(environment.concepts[gitem])
     return concept.lineage.content, unique(base, "address")
 
@@ -54,7 +56,7 @@ def gen_window_node(
     history: History,
     conditions: BuildWhereClause | None = None,
 ) -> StrategyNode | None:
-    base, parent_concepts = resolve_window_parent_concepts(concept, environment)
+    base, parent_concepts = resolve_window_parent_concepts(concept, environment, depth)
     logger.info(
         f"{padding(depth)}{LOGGER_PREFIX} generating window node for {concept} with parents {[x.address for x in parent_concepts]} and optional {local_optional}"
     )
@@ -62,7 +64,7 @@ def gen_window_node(
         x
         for x in local_optional
         if isinstance(x.lineage, WINDOW_TYPES)
-        and resolve_window_parent_concepts(x, environment)[1] == parent_concepts
+        and resolve_window_parent_concepts(x, environment, depth)[1] == parent_concepts
     ]
 
     targets = [base]
@@ -79,7 +81,7 @@ def gen_window_node(
     if equivalent_optional:
         for x in equivalent_optional:
             assert isinstance(x.lineage, WINDOW_TYPES)
-            base, parents = resolve_window_parent_concepts(x, environment)
+            base, parents = resolve_window_parent_concepts(x, environment, depth)
             logger.info(
                 f"{padding(depth)}{LOGGER_PREFIX} found equivalent optional {x} with parents {parents}"
             )

{pytrilogy-0.0.3.106 → pytrilogy-0.0.3.108}/trilogy/core/processing/nodes/group_node.py

@@ -49,6 +49,7 @@ class GroupNode(StrategyNode):
         existence_concepts: List[BuildConcept] | None = None,
         hidden_concepts: set[str] | None = None,
         ordering: BuildOrderBy | None = None,
+        required_outputs: List[BuildConcept] | None = None,
     ):
         super().__init__(
             input_concepts=input_concepts,
@@ -66,6 +67,9 @@ class GroupNode(StrategyNode):
             hidden_concepts=hidden_concepts,
             ordering=ordering,
         )
+        # the set of concepts required to preserve grain
+        # set by group by node generation with aggregates
+        self.required_outputs = required_outputs
 
     @classmethod
     def check_if_required(
@@ -184,4 +188,7 @@ class GroupNode(StrategyNode):
             existence_concepts=list(self.existence_concepts),
             hidden_concepts=set(self.hidden_concepts),
             ordering=self.ordering,
+            required_outputs=(
+                list(self.required_outputs) if self.required_outputs else None
+            ),
         )

{pytrilogy-0.0.3.106 → pytrilogy-0.0.3.108}/trilogy/parsing/render.py

@@ -8,7 +8,14 @@ from typing import Any
 from jinja2 import Template
 
 from trilogy.constants import DEFAULT_NAMESPACE, VIRTUAL_CONCEPT_PREFIX, MagicConstants
-from trilogy.core.enums import ConceptSource, DatePart, FunctionType, Modifier, Purpose
+from trilogy.core.enums import (
+    ConceptSource,
+    DatePart,
+    FunctionType,
+    Modifier,
+    Purpose,
+    ValidationScope,
+)
 from trilogy.core.models.author import (
     AggregateWrapper,
     AlignClause,
@@ -66,6 +73,7 @@ from trilogy.core.statements.author import (
     SelectItem,
     SelectStatement,
     TypeDeclaration,
+    ValidateStatement,
 )
 
 QUERY_TEMPLATE = Template(
@@ -445,6 +453,13 @@ class Renderer:
         final = "".join(prefixes)
         return f"{final}{self.to_string(arg.content)}"
 
+    @to_string.register
+    def _(self, arg: ValidateStatement):
+        targets = ",".join(arg.targets) if arg.targets else "*"
+        if arg.scope.value == ValidationScope.ALL:
+            return "validate all;"
+        return f"validate {arg.scope.value} {targets};"
+
     @to_string.register
     def _(self, arg: SelectStatement):
         with self.indented():

pytrilogy-0.0.3.108/trilogy/std/display.preql

@@ -0,0 +1,18 @@
+
+
+type percent float; # Percentage value
+
+def calc_percent(a, b, digits=-1) -> 
+    case 
+        when digits =-1 then 
+            case 
+                when b = 0 then 0.0::numeric
+                else (a/b)::numeric
+            end
+        else round((
+            case 
+                when b = 0 then 0.0::float
+                else (a/b)::float
+            end
+            )::numeric, digits) 
+    end::numeric::percent;

pytrilogy-0.0.3.106/trilogy/std/display.preql

@@ -1,9 +0,0 @@
-
-
-type percent float; # Percentage value
-
-def calc_percent(a, b, digits=-1) -> case when digits =-1 then 
-case when b = 0 then 0.0::numeric::percent else
-(a/b)::numeric::percent end
-else round((case when b = 0 then 0.0::float::percent else
-(a/b)::float::percent end):: numeric::percent, digits) end;