pytrilogy 0.0.3.40__tar.gz → 0.0.3.41__tar.gz

{pytrilogy-0.0.3.40/pytrilogy.egg-info → pytrilogy-0.0.3.41}/PKG-INFO

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

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.41/pytrilogy.egg-info}/PKG-INFO

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

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

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.41}/trilogy/core/environment_helpers.py

@@ -1,7 +1,7 @@
 from trilogy.constants import DEFAULT_NAMESPACE
 from trilogy.core.enums import ConceptSource, DatePart, FunctionType, Purpose
 from trilogy.core.functions import AttrAccess
-from trilogy.core.models.author import Concept, Function, Metadata, TraitDataType
+from trilogy.core.models.author import Concept, Function, Grain, Metadata, TraitDataType
 from trilogy.core.models.core import DataType, StructType, arg_to_datatype
 from trilogy.core.models.environment import Environment
 from trilogy.parsing.common import Meta
@@ -182,11 +182,9 @@ def generate_key_concepts(concept: Concept, environment: Environment):
             datatype=DataType.INTEGER,
             purpose=default_type,
             lineage=const_function,
-            grain=concept.grain,
+            grain=Grain(),
             namespace=concept.namespace,
-            keys={
-                concept.address,
-            },
+            keys=set(),
             metadata=Metadata(
                 description=f"Auto-derived integer. The {ftype.value} of {concept.address}, {base_description}",
                 line_number=base_line_number,

{pytrilogy-0.0.3.40 → pytrilogy-0.0.3.41}/trilogy/core/models/build.py

@@ -1697,6 +1697,7 @@ class Factory:
 
     @build.register
     def _(self, base: WhereClause) -> BuildWhereClause:
+
         return BuildWhereClause.model_construct(
             conditional=self.build(base.conditional)
         )
@@ -1756,14 +1757,14 @@ class Factory:
         from trilogy.parsing.common import arbitrary_to_concept
 
         left = base.left
-        if isinstance(left, AggregateWrapper):
+        if isinstance(left, (AggregateWrapper, WindowItem, FilterItem)):
             left_c = arbitrary_to_concept(
                 left,
                 environment=self.environment,
             )
             left = left_c  # type: ignore
         right = base.right
-        if isinstance(right, AggregateWrapper):
+        if isinstance(right, (AggregateWrapper, WindowItem, FilterItem)):
             right_c = arbitrary_to_concept(
                 right,
                 environment=self.environment,