Skip to content

feat: read_pandas accepts pandas Series and Index objects #573

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 4 commits into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ repos:
rev: v1.1.1
hooks:
- id: mypy
additional_dependencies: [types-requests, types-tabulate]
additional_dependencies: [types-requests, types-tabulate, pandas-stubs]
15 changes: 15 additions & 0 deletions bigframes/pandas/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,22 @@ def read_gbq_table(
read_gbq_table.__doc__ = inspect.getdoc(bigframes.session.Session.read_gbq_table)


@typing.overload
def read_pandas(pandas_dataframe: pandas.DataFrame) -> bigframes.dataframe.DataFrame:
...


@typing.overload
def read_pandas(pandas_dataframe: pandas.Series) -> bigframes.series.Series:
...


@typing.overload
def read_pandas(pandas_dataframe: pandas.Index) -> bigframes.core.indexes.Index:
...


def read_pandas(pandas_dataframe: Union[pandas.DataFrame, pandas.Series, pandas.Index]):
return global_session.with_default_session(
bigframes.session.Session.read_pandas,
pandas_dataframe,
Expand Down
2 changes: 1 addition & 1 deletion bigframes/series.py
Original file line number Diff line number Diff line change
Expand Up @@ -1514,7 +1514,7 @@ def map(
map_df = map_df.rename(columns={arg.name: self.name})
elif isinstance(arg, Mapping):
map_df = bigframes.dataframe.DataFrame(
{"keys": list(arg.keys()), self.name: list(arg.values())},
{"keys": list(arg.keys()), self.name: list(arg.values())}, # type: ignore
session=self._get_block().expr.session,
)
map_df = map_df.set_index("keys")
Expand Down
44 changes: 40 additions & 4 deletions bigframes/session/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@

# Avoid circular imports.
if typing.TYPE_CHECKING:
import bigframes.core.indexes
import bigframes.dataframe as dataframe
import bigframes.series

_BIGFRAMES_DEFAULT_CONNECTION_ID = "bigframes-default-connection"

Expand Down Expand Up @@ -963,7 +965,23 @@ def read_gbq_model(self, model_name: str):
model = self.bqclient.get_model(model_ref)
return bigframes.ml.loader.from_bq(self, model)

@typing.overload
def read_pandas(
self, pandas_dataframe: pandas.Index
) -> bigframes.core.indexes.Index:
...

@typing.overload
def read_pandas(self, pandas_dataframe: pandas.Series) -> bigframes.series.Series:
...

@typing.overload
def read_pandas(self, pandas_dataframe: pandas.DataFrame) -> dataframe.DataFrame:
...

def read_pandas(
self, pandas_dataframe: Union[pandas.DataFrame, pandas.Series, pandas.Index]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we still have a break-change at current timing? Thinking to rename pandas_dataframe to data(or else).

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the name is incorrect now, but I think its too late for breaking changes.

):
"""Loads DataFrame from a pandas DataFrame.

The pandas DataFrame will be persisted as a temporary BigQuery table, which can be
Expand All @@ -986,13 +1004,31 @@ def read_pandas(self, pandas_dataframe: pandas.DataFrame) -> dataframe.DataFrame
[2 rows x 2 columns]

Args:
pandas_dataframe (pandas.DataFrame):
a pandas DataFrame object to be loaded.
pandas_dataframe (pandas.DataFrame, pandas.Series, or pandas.Index):
a pandas DataFrame/Series/Index object to be loaded.

Returns:
bigframes.dataframe.DataFrame: The BigQuery DataFrame.
An equivalent bigframes.pandas.(DataFrame/Series/Index) object
"""
return self._read_pandas(pandas_dataframe, "read_pandas")
import bigframes.series as series

# Try to handle non-dataframe pandas objects as well
if isinstance(pandas_dataframe, pandas.Series):
bf_df = self._read_pandas(pandas.DataFrame(pandas_dataframe), "read_pandas")
bf_series = typing.cast(series.Series, bf_df[bf_df.columns[0]])
# wrapping into df can set name to 0 so reset to original object name
bf_series.name = pandas_dataframe.name
return bf_series
if isinstance(pandas_dataframe, pandas.Index):
return self._read_pandas(
pandas.DataFrame(index=pandas_dataframe), "read_pandas"
).index
if isinstance(pandas_dataframe, pandas.DataFrame):
return self._read_pandas(pandas_dataframe, "read_pandas")
else:
raise ValueError(
f"read_pandas() expects a pandas.DataFrame, but got a {type(pandas_dataframe)}"
)

def _read_pandas(
self, pandas_dataframe: pandas.DataFrame, api_name: str
Expand Down
15 changes: 15 additions & 0 deletions tests/system/small/test_session.py
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,21 @@ def test_read_pandas(session, scalars_dfs):
pd.testing.assert_frame_equal(result, expected)


def test_read_pandas_series(session):
idx = pd.Index([2, 7, 1, 2, 8], dtype=pd.Int64Dtype())
pd_series = pd.Series([3, 1, 4, 1, 5], dtype=pd.Int64Dtype(), index=idx)
bf_series = session.read_pandas(pd_series)

pd.testing.assert_series_equal(bf_series.to_pandas(), pd_series)


def test_read_pandas_index(session):
pd_idx = pd.Index([2, 7, 1, 2, 8], dtype=pd.Int64Dtype())
bf_idx = session.read_pandas(pd_idx)

pd.testing.assert_index_equal(bf_idx.to_pandas(), pd_idx)


def test_read_pandas_inline_respects_location():
options = bigframes.BigQueryOptions(location="europe-west1")
session = bigframes.Session(options)
Expand Down