pytrilogy 0.0.3.44__tar.gz → 0.0.3.46__tar.gz

{pytrilogy-0.0.3.44/pytrilogy.egg-info → pytrilogy-0.0.3.46}/PKG-INFO

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

{pytrilogy-0.0.3.44 → pytrilogy-0.0.3.46/pytrilogy.egg-info}/PKG-INFO

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

{pytrilogy-0.0.3.44 → pytrilogy-0.0.3.46}/tests/test_partial_handling.py

@@ -12,7 +12,7 @@ from trilogy.core.processing.concept_strategies_v3 import History, search_concep
 from trilogy.core.processing.node_generators import (
     gen_filter_node,
 )
-from trilogy.core.processing.nodes import MergeNode
+from trilogy.core.processing.nodes import FilterNode
 from trilogy.core.query_processor import generate_graph
 from trilogy.hooks.query_debugger import DebuggingHook
 
@@ -139,8 +139,8 @@ def test_partial_assignment():
         g=g,
         depth=0,
     )
-    assert isinstance(sourced, MergeNode)
-    assert len(sourced.parents) == 2
+    assert isinstance(sourced, FilterNode)
+    assert len(sourced.parents) == 1
 
 
 def test_filter_query():

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

{pytrilogy-0.0.3.44 → pytrilogy-0.0.3.46}/trilogy/core/models/author.py

@@ -1906,7 +1906,7 @@ class AggregateWrapper(Mergeable, DataTyped, ConceptArgs, Namespaced, BaseModel)
 
 
 class FilterItem(DataTyped, Namespaced, ConceptArgs, BaseModel):
-    content: Expr
+    content: FuncArgs
     where: "WhereClause"
 
     @field_validator("content", mode="before")

{pytrilogy-0.0.3.44 → pytrilogy-0.0.3.46}/trilogy/core/processing/concept_strategies_v3.py

@@ -748,6 +748,7 @@ def search_concepts(
     accept_partial: bool = False,
     conditions: BuildWhereClause | None = None,
 ) -> StrategyNode | None:
+    logger.error(f"starting search for {mandatory_list}")
     hist = history.get_history(
         search=mandatory_list, accept_partial=accept_partial, conditions=conditions
     )
@@ -1094,6 +1095,7 @@ def _search_concepts(
     logger.error(
         f"{depth_to_prefix(depth)}{LOGGER_PREFIX} Could not resolve concepts {[c.address for c in mandatory_list]}, network outcome was {complete}, missing {all_mandatory - found},"
     )
+
     return None
 
 

{pytrilogy-0.0.3.44 → pytrilogy-0.0.3.46}/trilogy/core/processing/node_generators/filter_node.py

@@ -56,12 +56,40 @@ def gen_filter_node(
                 continue
         if conditions and conditions == where:
             optional_included.append(x)
+
+    # sometimes, it's okay to include other local optional above the filter
+    # in case it is, prep our list
+    extra_row_level_optional: list[BuildConcept] = []
+    for x in local_optional:
+        if x.address in optional_included:
+            continue
+        extra_row_level_optional.append(x)
+
+    # this flag controls whether we materialize the filter as a where on the prior CTE
+    # or do the filtering inline as a case statement
+    optimized_pushdown = False
+    if not is_scalar_condition(where.conditional):
+        optimized_pushdown = False
+    elif not local_optional:
+        optimized_pushdown = True
+    elif conditions and conditions == where:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} query conditions are the same as filter conditions, can optimize across all concepts"
+        )
+        optimized_pushdown = True
+    elif optional_included == local_optional:
+        logger.info(
+            f"{padding(depth)}{LOGGER_PREFIX} all optional concepts are included in the filter, can optimize across all concepts"
+        )
+        optimized_pushdown = True
     logger.info(
         f"{padding(depth)}{LOGGER_PREFIX} filter `{concept}` condition `{concept.lineage.where}` derived from {immediate_parent.address} row parents {[x.address for x in parent_row_concepts]} and {[[y.address] for x  in parent_existence_concepts for y  in x]} existence parents"
     )
     # we'll populate this with the row parent
     # and the existence parent(s)
     core_parents = []
+    if not optimized_pushdown:
+        parent_row_concepts += extra_row_level_optional
 
     row_parent: StrategyNode = source_concepts(
         mandatory_list=parent_row_concepts,
@@ -99,21 +127,6 @@ def gen_filter_node(
         )
         return None
 
-    optimized_pushdown = False
-    if not is_scalar_condition(where.conditional):
-        optimized_pushdown = False
-    elif not local_optional:
-        optimized_pushdown = True
-    elif conditions and conditions == where:
-        logger.info(
-            f"{padding(depth)}{LOGGER_PREFIX} query conditions are the same as filter conditions, can optimize across all concepts"
-        )
-        optimized_pushdown = True
-    elif optional_included == local_optional:
-        logger.info(
-            f"{padding(depth)}{LOGGER_PREFIX} all optional concepts are included in the filter, can optimize across all concepts"
-        )
-        optimized_pushdown = True
     if optimized_pushdown:
         logger.info(
             f"{padding(depth)}{LOGGER_PREFIX} returning optimized filter node with pushdown to parent with condition {where.conditional}"
@@ -193,7 +206,9 @@ def gen_filter_node(
             + optional_outputs
         )
         return filter_node
-
+    logger.info(
+        f"{padding(depth)}{LOGGER_PREFIX} need to enrich filter node with additional concepts {[x.address for x in local_optional if x.address not in filter_node.output_concepts]}"
+    )
     enrich_node: StrategyNode = source_concepts(  # this fetches the parent + join keys
         # to then connect to the rest of the query
         mandatory_list=[immediate_parent] + parent_row_concepts + local_optional,

{pytrilogy-0.0.3.44 → pytrilogy-0.0.3.46}/trilogy/core/processing/nodes/__init__.py

@@ -1,5 +1,6 @@
 from pydantic import BaseModel, ConfigDict, Field
 
+from trilogy.core.exceptions import UnresolvableQueryException
 from trilogy.core.models.build import BuildConcept, BuildWhereClause
 from trilogy.core.models.build_environment import BuildEnvironment
 from trilogy.core.models.environment import Environment
@@ -18,7 +19,7 @@ class History(BaseModel):
     base_environment: Environment
     history: dict[str, StrategyNode | None] = Field(default_factory=dict)
     select_history: dict[str, StrategyNode | None] = Field(default_factory=dict)
-    started: set[str] = Field(default_factory=set)
+    started: dict[str, int] = Field(default_factory=dict)
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
     def _concepts_to_lookup(
@@ -27,13 +28,10 @@ class History(BaseModel):
         accept_partial: bool,
         conditions: BuildWhereClause | None = None,
     ) -> str:
+        base = sorted([c.address for c in search])
         if conditions:
-            return (
-                "-".join([c.address for c in search])
-                + str(accept_partial)
-                + str(conditions)
-            )
-        return "-".join([c.address for c in search]) + str(accept_partial)
+            return "-".join(base) + str(accept_partial) + str(conditions)
+        return "-".join(base) + str(accept_partial)
 
     def search_to_history(
         self,
@@ -80,13 +78,19 @@ class History(BaseModel):
         accept_partial: bool = False,
         conditions: BuildWhereClause | None = None,
     ):
-        self.started.add(
-            self._concepts_to_lookup(
-                search,
-                accept_partial=accept_partial,
-                conditions=conditions,
-            )
+        key = self._concepts_to_lookup(
+            search,
+            accept_partial=accept_partial,
+            conditions=conditions,
         )
+        if key in self.started:
+            self.started[key] += 1
+        else:
+            self.started[key] = 1
+        if self.started[key] > 5:
+            raise UnresolvableQueryException(
+                f"Was unable to resolve datasources to serve this query from model; unresolvable set was {search}. You may be querying unrelated concepts."
+            )
 
     def log_end(
         self,
@@ -94,13 +98,13 @@ class History(BaseModel):
         accept_partial: bool = False,
         conditions: BuildWhereClause | None = None,
     ):
-        self.started.discard(
-            self._concepts_to_lookup(
-                search,
-                accept_partial=accept_partial,
-                conditions=conditions,
-            )
+        key = self._concepts_to_lookup(
+            search,
+            accept_partial=accept_partial,
+            conditions=conditions,
         )
+        if key in self.started:
+            del self.started[key]
 
     def check_started(
         self,