Skip to content

Commit cc52100

Browse files
apronchenkovcopybara-github
authored andcommitted
Rename "experimental_aux_policy" to "aux_policy"
Motivation: The aux-policy mechanism is no longer considered experimental. While its usage patterns may continue to evolve, the core api is unlikely to undergo major changes. PiperOrigin-RevId: 861470059 Change-Id: I3d5ad6676664f4ce258264bd09f7486a99505570
1 parent 89743aa commit cc52100

File tree

9 files changed

+27
-31
lines changed

9 files changed

+27
-31
lines changed

py/koladata/operators/bags.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def is_null_bag(bag): # pylint: disable=unused-argument
6262
_qtype_utils.expect_data_bag_args(_P.bags),
6363
],
6464
qtype_inference_expr=_qtypes.DATA_BAG,
65-
experimental_aux_policy=_aux_policies.CLASSIC_AUX_POLICY,
65+
aux_policy=_aux_policies.CLASSIC_AUX_POLICY,
6666
)
6767
def enriched(*bags): # pylint: disable=unused-argument
6868
"""Creates a new immutable DataBag enriched by `bags`.
@@ -93,7 +93,7 @@ def enriched(*bags): # pylint: disable=unused-argument
9393
_qtype_utils.expect_data_bag_args(_P.bags),
9494
],
9595
qtype_inference_expr=_qtypes.DATA_BAG,
96-
experimental_aux_policy=_aux_policies.CLASSIC_AUX_POLICY,
96+
aux_policy=_aux_policies.CLASSIC_AUX_POLICY,
9797
)
9898
def updated(*bags): # pylint: disable=unused-argument
9999
"""Creates a new immutable DataBag updated by `bags`.

py/koladata/operators/classic_binding_policy_test.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131

3232

3333
@arolla.optools.as_lambda_operator(
34-
'op_with_classic_binding_policy',
35-
experimental_aux_policy=aux_policies.CLASSIC_AUX_POLICY,
34+
'op_with_classic_binding_policy', aux_policy=aux_policies.CLASSIC_AUX_POLICY
3635
)
3736
def op_with_classic_binding_policy(x, y):
3837
return (x, y)

py/koladata/operators/core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ def stub(x, attrs=data_slice.DataSlice.from_vals([])): # pylint: disable=unused
343343
qtype_utils.expect_data_bag_args(P.bag),
344344
],
345345
qtype_inference_expr=qtypes.DATA_SLICE,
346-
experimental_aux_policy=aux_policies.CLASSIC_AUX_POLICY,
346+
aux_policy=aux_policies.CLASSIC_AUX_POLICY,
347347
)
348348
def updated(ds, *bag): # pylint: disable=unused-argument
349349
"""Returns a copy of a DataSlice with DataBag(s) of updates applied.
@@ -1266,7 +1266,7 @@ def with_merged_bag(ds): # pylint: disable=unused-argument
12661266
qtype_utils.expect_data_bag_args(P.bag),
12671267
],
12681268
qtype_inference_expr=qtypes.DATA_SLICE,
1269-
experimental_aux_policy=aux_policies.CLASSIC_AUX_POLICY,
1269+
aux_policy=aux_policies.CLASSIC_AUX_POLICY,
12701270
)
12711271
def enriched(ds, *bag): # pylint: disable=unused-argument
12721272
"""Returns a copy of a DataSlice with a additional fallback DataBag(s).

py/koladata/operators/dicts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def _shaped(
5151
)
5252
@arolla.optools.as_lambda_operator(
5353
'kd.dicts.new',
54-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.dicts.new]',
54+
aux_policy='koladata_adhoc_binding_policy[kd.dicts.new]',
5555
qtype_constraints=[
5656
qtype_utils.expect_data_slice_or_unspecified(P.keys),
5757
qtype_utils.expect_data_slice_or_unspecified(P.values),

py/koladata/operators/lists.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ def _new(items, item_schema, schema, itemid): # pylint: disable=unused-argument
294294
)
295295
@arolla.optools.as_lambda_operator(
296296
'kd.lists.new',
297-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.lists.new]',
297+
aux_policy='koladata_adhoc_binding_policy[kd.lists.new]',
298298
qtype_constraints=[
299299
qtype_utils.expect_data_slice_or_unspecified(P.items),
300300
qtype_utils.expect_data_slice_or_unspecified(P.item_schema),

py/koladata/operators/optools.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ def impl(fn) -> arolla.types.RegisteredOperator:
248248
overloadable_op = arolla.optools.add_to_registry_as_overloadable(
249249
name,
250250
if_present='unsafe_override' if unsafe_override else 'raise',
251-
experimental_aux_policy=aux_policy,
251+
aux_policy=aux_policy,
252252
)(fn)
253253
arolla.abc.set_expr_view_for_registered_operator(name, view)
254254
arolla.abc.register_op_repr_fn_by_registration_name(name, repr_fn)

py/koladata/operators/slices.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ def size(x):
242242
qtype_utils.expect_data_slice_args(P.args),
243243
],
244244
qtype_inference_expr=P.args,
245-
experimental_aux_policy=aux_policies.CLASSIC_AUX_POLICY,
245+
aux_policy=aux_policies.CLASSIC_AUX_POLICY,
246246
)
247247
def align(*args): # pylint: disable=unused-argument
248248
"""Expands all of the DataSlices in `args` to the same common shape.
@@ -1566,7 +1566,7 @@ def _expect_data_slices_or_slices_or_ellipsis(value):
15661566
_expect_data_slices_or_slices_or_ellipsis(P.slices),
15671567
],
15681568
qtype_inference_expr=qtypes.DATA_SLICE,
1569-
experimental_aux_policy=aux_policies.CLASSIC_AUX_POLICY,
1569+
aux_policy=aux_policies.CLASSIC_AUX_POLICY,
15701570
)
15711571
def subslice(x, *slices): # pylint: disable=unused-argument
15721572
"""Slices `x` across all of its dimensions based on the provided `slices`.
@@ -1914,7 +1914,7 @@ def _zip(*args):
19141914
@optools.add_to_registry(aliases=['kd.item'], via_cc_operator_package=True)
19151915
@arolla.optools.as_lambda_operator(
19161916
'kd.slices.item',
1917-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.slices.item]',
1917+
aux_policy='koladata_adhoc_binding_policy[kd.slices.item]',
19181918
qtype_constraints=[
19191919
qtype_utils.expect_data_slice(P.x),
19201920
qtype_utils.expect_data_slice_or_unspecified(P.schema),
@@ -1984,7 +1984,7 @@ def _item_bind_args(x, schema=arolla.unspecified()):
19841984
@optools.add_to_registry(aliases=['kd.slice'], via_cc_operator_package=True)
19851985
@arolla.optools.as_lambda_operator(
19861986
'kd.slices.slice',
1987-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.slices.slice]',
1987+
aux_policy='koladata_adhoc_binding_policy[kd.slices.slice]',
19881988
qtype_constraints=[
19891989
qtype_utils.expect_data_slice(P.x),
19901990
qtype_utils.expect_data_slice_or_unspecified(P.schema),
@@ -2067,7 +2067,7 @@ def _typed_slice_bind_args(x, schema):
20672067
@optools.add_to_registry(aliases=['kd.int32'], via_cc_operator_package=True)
20682068
@arolla.optools.as_lambda_operator(
20692069
'kd.slices.int32',
2070-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.slices.int32]',
2070+
aux_policy='koladata_adhoc_binding_policy[kd.slices.int32]',
20712071
qtype_constraints=[
20722072
qtype_utils.expect_data_slice(P.x),
20732073
],
@@ -2087,7 +2087,7 @@ def int32(x):
20872087
@optools.add_to_registry(aliases=['kd.int64'], via_cc_operator_package=True)
20882088
@arolla.optools.as_lambda_operator(
20892089
'kd.slices.int64',
2090-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.slices.int64]',
2090+
aux_policy='koladata_adhoc_binding_policy[kd.slices.int64]',
20912091
qtype_constraints=[
20922092
qtype_utils.expect_data_slice(P.x),
20932093
],
@@ -2107,7 +2107,7 @@ def int64(x):
21072107
@optools.add_to_registry(aliases=['kd.float32'], via_cc_operator_package=True)
21082108
@arolla.optools.as_lambda_operator(
21092109
'kd.slices.float32',
2110-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.slices.float32]',
2110+
aux_policy='koladata_adhoc_binding_policy[kd.slices.float32]',
21112111
qtype_constraints=[
21122112
qtype_utils.expect_data_slice(P.x),
21132113
],
@@ -2127,7 +2127,7 @@ def float32(x):
21272127
@optools.add_to_registry(aliases=['kd.float64'], via_cc_operator_package=True)
21282128
@arolla.optools.as_lambda_operator(
21292129
'kd.slices.float64',
2130-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.slices.float64]',
2130+
aux_policy='koladata_adhoc_binding_policy[kd.slices.float64]',
21312131
qtype_constraints=[
21322132
qtype_utils.expect_data_slice(P.x),
21332133
],
@@ -2147,7 +2147,7 @@ def float64(x):
21472147
@optools.add_to_registry(aliases=['kd.str'], via_cc_operator_package=True)
21482148
@arolla.optools.as_lambda_operator(
21492149
'kd.slices.str',
2150-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.slices.str]',
2150+
aux_policy='koladata_adhoc_binding_policy[kd.slices.str]',
21512151
qtype_constraints=[
21522152
qtype_utils.expect_data_slice(P.x),
21532153
],
@@ -2227,7 +2227,7 @@ def get_repr(
22272227
@optools.add_to_registry(aliases=['kd.bytes'], via_cc_operator_package=True)
22282228
@arolla.optools.as_lambda_operator(
22292229
'kd.slices.bytes',
2230-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.slices.bytes]',
2230+
aux_policy='koladata_adhoc_binding_policy[kd.slices.bytes]',
22312231
qtype_constraints=[
22322232
qtype_utils.expect_data_slice(P.x),
22332233
],
@@ -2247,7 +2247,7 @@ def bytes_(x):
22472247
@optools.add_to_registry(aliases=['kd.bool'], via_cc_operator_package=True)
22482248
@arolla.optools.as_lambda_operator(
22492249
'kd.slices.bool',
2250-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.slices.bool]',
2250+
aux_policy='koladata_adhoc_binding_policy[kd.slices.bool]',
22512251
qtype_constraints=[
22522252
qtype_utils.expect_data_slice(P.x),
22532253
],
@@ -2267,7 +2267,7 @@ def bool_(x):
22672267
@optools.add_to_registry(aliases=['kd.mask'], via_cc_operator_package=True)
22682268
@arolla.optools.as_lambda_operator(
22692269
'kd.slices.mask',
2270-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.slices.mask]',
2270+
aux_policy='koladata_adhoc_binding_policy[kd.slices.mask]',
22712271
qtype_constraints=[
22722272
qtype_utils.expect_data_slice(P.x),
22732273
],
@@ -2289,7 +2289,7 @@ def mask(x):
22892289
)
22902290
@arolla.optools.as_lambda_operator(
22912291
'kd.slices.expr_quote',
2292-
experimental_aux_policy=(
2292+
aux_policy=(
22932293
'koladata_adhoc_binding_policy[kd.slices.expr_quote]'
22942294
),
22952295
qtype_constraints=[

py/koladata/operators/strings.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def find(
170170
qtype_utils.expect_data_slice_args(P.args),
171171
],
172172
qtype_inference_expr=qtypes.DATA_SLICE,
173-
experimental_aux_policy=aux_policies.CLASSIC_AUX_POLICY,
173+
aux_policy=aux_policies.CLASSIC_AUX_POLICY,
174174
)
175175
def printf(fmt, *args): # pylint: disable=unused-argument
176176
"""Formats strings according to printf-style (C++) format strings.
@@ -244,10 +244,8 @@ def format_(fmt, /, **kwargs): # pylint: disable=unused-argument
244244
@optools.add_to_registry(aliases=['kd.fstr'], via_cc_operator_package=True)
245245
@arolla.optools.as_lambda_operator(
246246
'kd.strings.fstr',
247-
experimental_aux_policy='koladata_adhoc_binding_policy[kd.strings.fstr]',
248-
qtype_constraints=[
249-
qtype_utils.expect_data_slice(P.fmt),
250-
],
247+
aux_policy='koladata_adhoc_binding_policy[kd.strings.fstr]',
248+
qtype_constraints=[qtype_utils.expect_data_slice(P.fmt)],
251249
)
252250
def fstr(fmt):
253251
"""Transforms Koda f-string into an expression.
@@ -329,7 +327,7 @@ def _fstr_bind_args(fstr, /): # pylint: disable=redefined-outer-name
329327
qtype_utils.expect_data_slice_args(P.args),
330328
],
331329
qtype_inference_expr=qtypes.DATA_SLICE,
332-
experimental_aux_policy=aux_policies.CLASSIC_AUX_POLICY,
330+
aux_policy=aux_policies.CLASSIC_AUX_POLICY,
333331
)
334332
def _test_only_format_wrapper(fmt, arg_names, *args): # pylint: disable=unused-argument
335333
"""Test only wrapper for format with Arolla signature."""
@@ -347,7 +345,7 @@ def _test_only_format_wrapper(fmt, arg_names, *args): # pylint: disable=unused-
347345
qtype_utils.expect_data_slice_args(P.args),
348346
],
349347
qtype_inference_expr=qtypes.DATA_SLICE,
350-
experimental_aux_policy=aux_policies.CLASSIC_AUX_POLICY,
348+
aux_policy=aux_policies.CLASSIC_AUX_POLICY,
351349
)
352350
def join(*args): # pylint: disable=unused-argument
353351
"""Concatenates the given strings.

py/koladata/operators/tuple.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@
3333
# implemented Koladata-specific boxing rules.
3434
@optools.add_to_registry(aliases=['kd.tuple'], via_cc_operator_package=True)
3535
@arolla.optools.as_lambda_operator(
36-
'kd.tuples.tuple',
37-
experimental_aux_policy=aux_policies.CLASSIC_AUX_POLICY,
36+
'kd.tuples.tuple', aux_policy=aux_policies.CLASSIC_AUX_POLICY
3837
)
3938
def tuple_(*args):
4039
"""Returns a tuple-like object containing the given `*args`."""

0 commit comments

Comments
 (0)