chalkruntime 3.35.7__tar.gz → 3.35.8__tar.gz

{chalkruntime-3.35.7 → chalkruntime-3.35.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chalkruntime
-Version: 3.35.7
+Version: 3.35.8
 Summary: Runtime support library for Chalk AI
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{chalkruntime-3.35.7 → chalkruntime-3.35.8}/chalkruntime/graph/convert_chalkpy_underscore.py

@@ -43,6 +43,7 @@ from chalkruntime.graph.feature import (
     GroupByFeatureType,
     HasManyFeatureType,
     HasOneFeatureType,
+    HasOnePathObjParsed,
     NestedFeatureType,
     OutputUnderscoreFeatureType,
     ScalarFeatureType,
@@ -2661,23 +2662,80 @@ def _convert_underscore_materialized_aggregation(
     _aggregate_key = aggregate_operand.feature_keys[0]
 
     aggregate_hasmany_parsed = aggregate_operand.parent
-    if len(aggregate_hasmany_parsed.path) != 1:
+    # Accept either a direct has-many (path length 1) or a single has-one followed by a has-many
+    # (path length 2). The latter supports expressions like `_.user.transactions.count()` on a
+    # parent feature class that reaches the events through a has-one. Multi-hop chains aren't
+    # supported because the chalkpy parser only validates a single has-one prefix; keep the engine
+    # in lockstep.
+    path_len = len(aggregate_hasmany_parsed.path)
+    intermediate: HasOneFeatureType | None = None
+    if path_len == 1:
+        aggregate_hasmany: HasOneFeatureType | HasManyFeatureType = aggregate_hasmany_parsed.path[0]
+    elif path_len == 2:
+        prefix = aggregate_hasmany_parsed.path[0]
+        if not isinstance(prefix, HasOneFeatureType):
+            raise ValueError(
+                f"The windowed aggregation operation '{window_materialization.aggregation}' only supports "
+                + f"a single has-one prefix before the has-many; got '{prefix}' in path"
+            )
+        intermediate = prefix
+        aggregate_hasmany = aggregate_hasmany_parsed.path[1]
+    else:
         raise ValueError(
-            f"The windowed aggregation operation '{window_materialization.aggregation}' can only be applied to a has-many, not a nested relationship"
+            f"The windowed aggregation operation '{window_materialization.aggregation}' can only be applied to "
+            + "a has-many directly or via a single has-one prefix, not a longer nested relationship"
         )
 
-    aggregate_hasmany: HasOneFeatureType | HasManyFeatureType = aggregate_hasmany_parsed.path[0]
-
     if isinstance(aggregate_hasmany, HasOneFeatureType):
         raise ValueError(
             f"The windowed aggregation operation '{window_materialization.aggregation}' can only be applied to a has-many, not to a has-one relationship '{aggregate_hasmany}'"
         )
 
+    # group_by_keys are the inputs to the synthetic underscore resolver that fetches
+    # the materialized value for `for_feature`. The resolver's output is on
+    # `for_feature.root_namespace`, so its inputs must live there too — otherwise the
+    # planner refuses to run it with "input and output namespaces must match".
+    #
+    # Direct has-many (`_.transactions.count()` on User): the has-many's local join
+    # features are already on `User` (== for_feature.root_namespace), so use them.
+    #
+    # has-one prefix (`_.user.transactions.count()` on FraudFeatures): the has-many's
+    # local join features (e.g. User.id) live on the intermediate namespace, not on
+    # `for_feature.root_namespace`. Wrap each one in a NestedFeatureType through the
+    # has-one (`FraudFeatures.user.id`) so its root_namespace becomes the parent's; the
+    # engine resolver walks the has-one at lookup time, so we don't have to assume the
+    # parent FK and the intermediate PK are name-equivalent. The materialization tiles
+    # themselves remain keyed by `Transaction.user_id` via `window_materialization
+    # .group_by`; only the resolver's input namespace shifts.
+    if intermediate is not None:
+        # Defense in depth: chalkpy validates that the has-one's foreign keys overlap
+        # with the has-many's local keys at parse time; mirror that check here so the
+        # engine doesn't depend on frontend validation alone.
+        intermediate_foreign_keys = {f.fqn for f in intermediate.get_foreign_join_features()}
+        has_many_local_keys = {f.fqn for f in aggregate_hasmany.get_local_join_features()}
+        if not intermediate_foreign_keys.issubset(has_many_local_keys):
+            raise ValueError(
+                "Join keys do not match for has-one prefix on materialized aggregation "
+                + f"'{for_feature.fqn}': has-one '{intermediate.fqn}' joins via "
+                + f"{sorted(intermediate_foreign_keys)} but has-many '{aggregate_hasmany.fqn}' "
+                + f"joins via {sorted(has_many_local_keys)}; these must overlap."
+            )
+        group_by_keys = tuple(
+            NestedFeatureType(
+                underlying_ref=local_feat,
+                path=(HasOnePathObjParsed(intermediate, local_feat),),
+                _graph=intermediate.graph,
+            )
+            for local_feat in aggregate_hasmany.get_local_join_features()
+        )
+    else:
+        group_by_keys = (*aggregate_hasmany.get_local_join_features(),)
+
     return UnderscoreMaterializedAggregation(
         unmaterialized_underscore=resolved_underscore,
         original_underscore=underscore,
         materialization=window_materialization,
-        group_by_keys=(*aggregate_hasmany.get_local_join_features(),),
+        group_by_keys=group_by_keys,
         window_duration=window_duration,
         source_aggregation_namespace=for_feature.root_namespace,
         has_many=aggregate_hasmany,

{chalkruntime-3.35.7 → chalkruntime-3.35.8}/chalkruntime.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chalkruntime
-Version: 3.35.7
+Version: 3.35.8
 Summary: Runtime support library for Chalk AI
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown

{chalkruntime-3.35.7 → chalkruntime-3.35.8}/pyproject.toml

@@ -42,7 +42,7 @@ name = "chalkruntime"
 description = "Runtime support library for Chalk AI"
 readme = "README.md"
 requires-python = ">=3.10"
-version = "3.35.7"
+version = "3.35.8"
 
 
 [tool.deptry]