Skip to content

preserve index in list accessor #58438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
1 change: 1 addition & 0 deletions doc/source/whatsnew/v3.0.0.rst
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,7 @@ Styler
Other
^^^^^
- Bug in :class:`DataFrame` when passing a ``dict`` with a NA scalar and ``columns`` that would always return ``np.nan`` (:issue:`57205`)
- Bug in :class:`ListAccessor` not preserving index. (:issue:`58425`)
- Bug in :func:`unique` on :class:`Index` not always returning :class:`Index` (:issue:`57043`)
- Bug in :meth:`DataFrame.eval` and :meth:`DataFrame.query` which caused an exception when using NumPy attributes via ``@`` notation, e.g., ``df.eval("@np.floor(a)")``. (:issue:`58041`)
- Bug in :meth:`DataFrame.eval` and :meth:`DataFrame.query` which did not allow to use ``tan`` function. (:issue:`55091`)
Expand Down
22 changes: 14 additions & 8 deletions pandas/core/arrays/arrow/accessors.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,9 @@ def len(self) -> Series:
from pandas import Series

value_lengths = pc.list_value_length(self._pa_array)
return Series(value_lengths, dtype=ArrowDtype(value_lengths.type))
return Series(
value_lengths, dtype=ArrowDtype(value_lengths.type), index=self._data.index
)

def __getitem__(self, key: int | slice) -> Series:
"""
Expand Down Expand Up @@ -149,7 +151,9 @@ def __getitem__(self, key: int | slice) -> Series:
# if key < 0:
# key = pc.add(key, pc.list_value_length(self._pa_array))
element = pc.list_element(self._pa_array, key)
return Series(element, dtype=ArrowDtype(element.type))
return Series(
element, dtype=ArrowDtype(element.type), index=self._data.index
)
elif isinstance(key, slice):
if pa_version_under11p0:
raise NotImplementedError(
Expand All @@ -167,7 +171,7 @@ def __getitem__(self, key: int | slice) -> Series:
if step is None:
step = 1
sliced = pc.list_slice(self._pa_array, start, stop, step)
return Series(sliced, dtype=ArrowDtype(sliced.type))
return Series(sliced, dtype=ArrowDtype(sliced.type), index=self._data.index)
else:
raise ValueError(f"key must be an int or slice, got {type(key).__name__}")

Expand Down Expand Up @@ -195,15 +199,17 @@ def flatten(self) -> Series:
... )
>>> s.list.flatten()
0 1
1 2
2 3
3 3
0 2
0 3
1 3
dtype: int64[pyarrow]
"""
from pandas import Series

flattened = pc.list_flatten(self._pa_array)
return Series(flattened, dtype=ArrowDtype(flattened.type))
counts = pa.compute.list_value_length(self._pa_array)
flattened = pa.compute.list_flatten(self._pa_array)
index = self._data.index.repeat(counts.fill_null(pa.scalar(0, counts.type)))
return Series(flattened, dtype=ArrowDtype(flattened.type), index=index)


class StructAccessor(ArrowAccessor):
Expand Down
25 changes: 22 additions & 3 deletions pandas/tests/series/accessors/test_list_accessor.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,23 @@ def test_list_getitem(list_dtype):
tm.assert_series_equal(actual, expected)


def test_list_getitem_index():
# GH 58425
ser = Series(
[[1, 2, 3], [4, None, 5], None],
dtype=ArrowDtype(pa.list_(pa.int64())),
index=[1, 3, 7],
)
actual = ser.list[1]
expected = Series([2, None, None], dtype="int64[pyarrow]", index=[1, 3, 7])
tm.assert_series_equal(actual, expected)


def test_list_getitem_slice():
ser = Series(
[[1, 2, 3], [4, None, 5], None],
dtype=ArrowDtype(pa.list_(pa.int64())),
index=[1, 3, 7],
)
if pa_version_under11p0:
with pytest.raises(
Expand All @@ -44,7 +57,9 @@ def test_list_getitem_slice():
else:
actual = ser.list[1:None:None]
expected = Series(
[[2, 3], [None, 5], None], dtype=ArrowDtype(pa.list_(pa.int64()))
[[2, 3], [None, 5], None],
dtype=ArrowDtype(pa.list_(pa.int64())),
index=[1, 3, 7],
)
tm.assert_series_equal(actual, expected)

Expand All @@ -61,11 +76,15 @@ def test_list_len():

def test_list_flatten():
ser = Series(
[[1, 2, 3], [4, None], None],
[[1, 2, 3], None, [4, None], [], [7, 8]],
dtype=ArrowDtype(pa.list_(pa.int64())),
)
actual = ser.list.flatten()
expected = Series([1, 2, 3, 4, None], dtype=ArrowDtype(pa.int64()))
expected = Series(
[1, 2, 3, 4, None, 7, 8],
dtype=ArrowDtype(pa.int64()),
index=[0, 0, 0, 2, 2, 4, 4],
)
tm.assert_series_equal(actual, expected)


Expand Down