pytrilogy 0.0.3.44__tar.gz → 0.0.3.45__tar.gz

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

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

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

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

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

{pytrilogy-0.0.3.44 → pytrilogy-0.0.3.45}/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.45}/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.45}/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,