Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions bigframes/dataframe.py
Original file line number Diff line number Diff line change
Expand Up @@ -3924,6 +3924,10 @@ def map(self, func, na_action: Optional[str] = None) -> DataFrame:
)

def apply(self, func, *, axis=0, args: typing.Tuple = (), **kwargs):
# In Bigframes remote function, DataFrame '.apply' method is specifically
# designed to work with row-wise or column-wise operations, where the input
# to the applied function should be a Series, not a scalar.

if utils.get_axis_number(axis) == 1:
msg = "axis=1 scenario is in preview."
warnings.warn(msg, category=bfe.PreviewWarning)
Expand Down Expand Up @@ -4031,8 +4035,19 @@ def apply(self, func, *, axis=0, args: typing.Tuple = (), **kwargs):

return result_series

# At this point column-wise or element-wise remote function operation will
# be performed (not supported).
if hasattr(func, "bigframes_remote_function"):
raise NotImplementedError(
"BigFrames DataFrame '.apply()' does not support remote function "
"for column-wise (i.e. with axis=0) operations, please use a "
"regular python function instead. For element-wise operations of "
"the remote function, please use '.map()'."
)

# Per-column apply
results = {name: func(col, *args, **kwargs) for name, col in self.items()}

if all(
[
isinstance(val, bigframes.series.Series) or utils.is_list_like(val)
Expand Down
24 changes: 24 additions & 0 deletions tests/system/small/test_remote_function.py
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,30 @@ def test_read_gbq_function_supported_python_output_type(
rf.read_gbq_function(str(sql_routine.reference), session=session)


@pytest.mark.flaky(retries=2, delay=120)
def test_df_apply_scalar_func(session, scalars_dfs):
scalars_df, _ = scalars_dfs
bdf = bigframes.pandas.DataFrame(
{
"Column1": scalars_df["string_col"],
"Column2": scalars_df["string_col"],
}
)

# The "cw_lower_case_ascii_only" is a scalar function.
func_ref = session.read_gbq_function("bqutil.fn.cw_lower_case_ascii_only")

# DataFrame '.apply()' only supports series level application.
with pytest.raises(NotImplementedError) as context:
bdf.apply(func_ref)
assert str(context.value) == (
"BigFrames DataFrame '.apply()' does not support remote function for "
"column-wise (i.e. with axis=0) operations, please use a regular python "
"function instead. For element-wise operations of the remote function, "
"please use '.map()'."
)


@pytest.mark.flaky(retries=2, delay=120)
def test_read_gbq_function_multiple_inputs_not_a_row_processor(session):
with pytest.raises(ValueError) as context:
Expand Down
Loading