pytrilogy 0.0.3.92__py3-none-any.whl → 0.0.3.93__py3-none-any.whl

trilogy/core/models/build_environment.py

@@ -90,9 +90,7 @@ def validate_concepts(v) -> BuildEnvironmentConceptDict:
     if isinstance(v, BuildEnvironmentConceptDict):
         return v
     elif isinstance(v, dict):
-        return BuildEnvironmentConceptDict(
-            **{x: BuildConcept.model_validate(y) for x, y in v.items()}
-        )
+        return BuildEnvironmentConceptDict(**{x: y for x, y in v.items()})
     raise ValueError
 
 
@@ -100,9 +98,7 @@ def validate_datasources(v) -> BuildEnvironmentDatasourceDict:
     if isinstance(v, BuildEnvironmentDatasourceDict):
         return v
     elif isinstance(v, dict):
-        return BuildEnvironmentDatasourceDict(
-            **{x: BuildDatasource.model_validate(y) for x, y in v.items()}
-        )
+        return BuildEnvironmentDatasourceDict(**{x: y for x, y in v.items()})
     raise ValueError
 
 

trilogy/core/models/execute.py

@@ -859,7 +859,7 @@ class RecursiveCTE(CTE):
                     ),
                     BuildCaseElse(expr=False),
                 ],
-                output_datatype=DataType.BOOL,
+                output_data_type=DataType.BOOL,
                 output_purpose=Purpose.KEY,
             ),
         )
@@ -884,7 +884,7 @@ class RecursiveCTE(CTE):
                     ),
                     BuildCaseElse(expr=False),
                 ],
-                output_datatype=DataType.BOOL,
+                output_data_type=DataType.BOOL,
                 output_purpose=Purpose.KEY,
             ),
         )
@@ -909,7 +909,7 @@ class RecursiveCTE(CTE):
                     ),
                     BuildCaseElse(expr=right_recurse_concept),
                 ],
-                output_datatype=recursive_derived.datatype,
+                output_data_type=recursive_derived.datatype,
                 output_purpose=recursive_derived.purpose,
             ),
         )

trilogy/core/processing/node_generators/group_node.py

@@ -61,13 +61,13 @@ def gen_group_node(
 
     # if the aggregation has a grain, we need to ensure these are the ONLY optional in the output of the select
     output_concepts = [concept]
-
+    grain_components = [environment.concepts[c] for c in concept.grain.components]
     if (
         concept.grain
         and len(concept.grain.components) > 0
         and not concept.grain.abstract
     ):
-        grain_components = [environment.concepts[c] for c in concept.grain.components]
+
         parent_concepts += grain_components
         build_grain_parents = get_aggregate_grain(concept, environment)
         output_concepts += grain_components
@@ -131,10 +131,6 @@ def gen_group_node(
     else:
         parents = []
 
-    # the keys we group by
-    # are what we can use for enrichment
-    group_key_parents = [environment.concepts[c] for c in concept.grain.components]
-
     group_node = GroupNode(
         output_concepts=output_concepts,
         input_concepts=parent_concepts,
@@ -164,7 +160,7 @@ def gen_group_node(
     )
     return gen_enrichment_node(
         group_node,
-        join_keys=group_key_parents,
+        join_keys=grain_components,
         local_optional=local_optional,
         environment=environment,
         g=g,