pytrilogy 0.0.3.81__tar.gz → 0.0.3.82__tar.gz

{pytrilogy-0.0.3.81/pytrilogy.egg-info → pytrilogy-0.0.3.82}/PKG-INFO

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

{pytrilogy-0.0.3.81 → pytrilogy-0.0.3.82/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.81 → pytrilogy-0.0.3.82}/pytrilogy.egg-info/SOURCES.txt

@@ -81,6 +81,7 @@ trilogy/core/processing/utility.py
 trilogy/core/processing/node_generators/__init__.py
 trilogy/core/processing/node_generators/basic_node.py
 trilogy/core/processing/node_generators/common.py
+trilogy/core/processing/node_generators/constant_node.py
 trilogy/core/processing/node_generators/filter_node.py
 trilogy/core/processing/node_generators/group_node.py
 trilogy/core/processing/node_generators/group_to_node.py

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

{pytrilogy-0.0.3.81 → pytrilogy-0.0.3.82}/trilogy/core/processing/concept_strategies_v3.py

@@ -63,6 +63,11 @@ def generate_candidates_restrictive(
         and x.address not in priority_concept.pseudonyms
         and priority_concept.address not in x.pseudonyms
     ]
+
+    # if it's single row, joins are irrelevant. Fetch without keys.
+    if priority_concept.granularity == Granularity.SINGLE_ROW:
+        return [], conditions
+
     if conditions and priority_concept.derivation in ROOT_DERIVATIONS:
         logger.info(
             f"{depth_to_prefix(depth)}{LOGGER_PREFIX} Injecting additional conditional row arguments as all remaining concepts are roots or constant"
@@ -72,9 +77,6 @@ def generate_candidates_restrictive(
             unique(list(conditions.row_arguments) + local_candidates, "address"),
             None,
         )
-    # if it's single row, joins are irrelevant. Fetch without keys.
-    if priority_concept.granularity == Granularity.SINGLE_ROW:
-        return [], conditions
 
     return local_candidates, conditions
 
@@ -324,7 +326,6 @@ def check_for_early_exit(
             f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Not complete (missing {missing}), continuing search"
         )
     # if we have attempted on root node, we've tried them all.
-    # inject in another search with filter concepts
     if priority_concept.derivation == Derivation.ROOT:
         logger.info(
             f"{depth_to_prefix(context.depth)}{LOGGER_PREFIX} Breaking as attempted root with no results"
@@ -364,7 +365,7 @@ def generate_loop_completion(context: LoopContext, virtual: set[str]) -> Strateg
             for x in context.stack
         }
         logger.info(
-            f"Condition {context.conditions} not required, parents included filtering! {parent_map }"
+            f"Condition {context.conditions} not required, parents included filtering! {parent_map}"
         )
     if len(context.stack) == 1:
         output: StrategyNode = context.stack[0]

{pytrilogy-0.0.3.81 → pytrilogy-0.0.3.82}/trilogy/core/processing/discovery_node_factory.py

@@ -12,6 +12,7 @@ from trilogy.core.models.build_environment import BuildEnvironment
 from trilogy.core.processing.discovery_utility import LOGGER_PREFIX, depth_to_prefix
 from trilogy.core.processing.node_generators import (
     gen_basic_node,
+    gen_constant_node,
     gen_filter_node,
     gen_group_node,
     gen_group_to_node,
@@ -252,6 +253,21 @@ def _generate_basic_node(ctx: NodeGenerationContext) -> StrategyNode | None:
     )
 
 
+def _generate_constant_node(ctx: NodeGenerationContext) -> StrategyNode | None:
+    ctx.log_generation("constant")
+    return gen_constant_node(
+        ctx.concept,
+        ctx.local_optional,
+        history=ctx.history,
+        environment=ctx.environment,
+        g=ctx.g,
+        depth=ctx.next_depth,
+        source_concepts=ctx.source_concepts,
+        conditions=ctx.conditions,
+        accept_partial=ctx.accept_partial,
+    )
+
+
 class RootNodeHandler:
     """Handles complex root node generation logic."""
 
@@ -469,7 +485,7 @@ def generate_node(
         Derivation.GROUP_TO: lambda: _generate_group_to_node(context),
         Derivation.BASIC: lambda: _generate_basic_node(context),
         Derivation.ROOT: lambda: RootNodeHandler(context).generate(),
-        Derivation.CONSTANT: lambda: RootNodeHandler(context).generate(),
+        Derivation.CONSTANT: lambda: _generate_constant_node(context),
     }
 
     handler = derivation_handlers.get(concept.derivation)

{pytrilogy-0.0.3.81 → pytrilogy-0.0.3.82}/trilogy/core/processing/discovery_validation.py

@@ -105,7 +105,6 @@ def validate_stack(
 
         for concept in resolved.output_concepts:
             if concept.address in resolved.hidden_concepts:
-
                 continue
 
             validate_concept(

{pytrilogy-0.0.3.81 → pytrilogy-0.0.3.82}/trilogy/core/processing/node_generators/__init__.py

@@ -1,4 +1,5 @@
 from .basic_node import gen_basic_node
+from .constant_node import gen_constant_node
 from .filter_node import gen_filter_node
 from .group_node import gen_group_node
 from .group_to_node import gen_group_to_node
@@ -26,4 +27,5 @@ __all__ = [
     "gen_multiselect_node",
     "gen_synonym_node",
     "gen_recursive_node",
+    "gen_constant_node",
 ]

pytrilogy-0.0.3.82/trilogy/core/processing/node_generators/constant_node.py

@@ -0,0 +1,38 @@
+from typing import List
+
+from trilogy.core.models.build import BuildConcept, BuildWhereClause
+from trilogy.core.models.build_environment import BuildEnvironment
+from trilogy.core.processing.nodes import History, StrategyNode
+
+LOGGER_PREFIX = "[GEN_CONSTANT_NODE]"
+
+
+def gen_constant_node(
+    concept: BuildConcept,
+    local_optional: List[BuildConcept],
+    environment: BuildEnvironment,
+    g,
+    depth: int,
+    source_concepts,
+    history: History | None = None,
+    conditions: BuildWhereClause | None = None,
+    accept_partial: bool = False,
+):
+    """our only goal here is to generate a row if conditions exist, or none if they do not"""
+
+    targets = [concept] + local_optional
+    if conditions:
+        targets += conditions.row_arguments
+    parent_node: StrategyNode | None = source_concepts(
+        mandatory_list=targets,
+        environment=environment,
+        g=g,
+        depth=depth + 1,
+        history=history,
+        conditions=conditions,
+        accept_partial=accept_partial,
+    )
+    if not parent_node:
+        return None
+    parent_node.set_output_concepts([concept] + local_optional)
+    return parent_node

{pytrilogy-0.0.3.81 → pytrilogy-0.0.3.82}/trilogy/core/processing/utility.py

@@ -10,6 +10,7 @@ from trilogy.constants import MagicConstants
 from trilogy.core.enums import (
     BooleanOperator,
     DatePart,
+    Derivation,
     FunctionClass,
     Granularity,
     JoinType,
@@ -262,16 +263,19 @@ def calculate_graph_relevance(
     """
     relevance = 0
     for node in g.nodes:
+
         if node not in subset_nodes:
             continue
         if not g.nodes[node]["type"] == NodeType.CONCEPT:
             continue
         concept = [x for x in concepts if x.address == node].pop()
-
+        # debug granularity and derivation
         # a single row concept can always be crossjoined
         # therefore a graph with only single row concepts is always relevant
         if concept.granularity == Granularity.SINGLE_ROW:
             continue
+        if concept.derivation == Derivation.CONSTANT:
+            continue
         # if it's an aggregate up to an arbitrary grain, it can be joined in later
         # and can be ignored in subgraph
         if concept.purpose == Purpose.METRIC:
@@ -284,7 +288,6 @@ def calculate_graph_relevance(
             continue
         # Added 2023-10-18 since we seemed to be strangely dropping things
         relevance += 1
-
     return relevance
 
 

{pytrilogy-0.0.3.81 → pytrilogy-0.0.3.82}/trilogy/core/processing/discovery_utility.py

@@ -73,11 +73,11 @@ def get_priority_concept(
             + [c for c in remaining_concept if c.derivation == Derivation.RECURSIVE]
             + [c for c in remaining_concept if c.derivation == Derivation.BASIC]
             + [c for c in remaining_concept if c.derivation == Derivation.GROUP_TO]
+            + [c for c in remaining_concept if c.derivation == Derivation.CONSTANT]
             # finally our plain selects
             + [
                 c for c in remaining_concept if c.derivation == Derivation.ROOT
             ]  # and any non-single row constants
-            + [c for c in remaining_concept if c.derivation == Derivation.CONSTANT]
         )
 
         priority += [