revert new session methods

Author: tswast

bigframes/core/indexes/base.py

@@ -383,16 +383,9 @@ def to_series(
 
         name = self.name if name is None else name
         if index is None:
-            return bigframes.series.Series(
-                data=self, index=self, name=name, session=self._session
-            )
+            return bigframes.series.Series(data=self, index=self, name=name)
         else:
-            return bigframes.series.Series(
-                data=self,
-                index=Index(index, session=self._session),
-                name=name,
-                session=self._session,
-            )
+            return bigframes.series.Series(data=self, index=Index(index), name=name)
 
     def get_level_values(self, level) -> Index:
         level_n = level if isinstance(level, int) else self.names.index(level)

bigframes/core/indexes/multi.py

@@ -14,7 +14,7 @@
 
 from __future__ import annotations
 
-from typing import cast, Hashable, Iterable, Optional, Sequence, TYPE_CHECKING
+from typing import cast, Hashable, Iterable, Sequence
 
 import bigframes_vendored.pandas.core.indexes.multi as vendored_pandas_multindex
 import pandas
@@ -23,9 +23,6 @@
 from bigframes.core import expression as ex
 from bigframes.core.indexes.base import Index
 
-if TYPE_CHECKING:
-    import bigframes.session
-
 
 class MultiIndex(Index, vendored_pandas_multindex.MultiIndex):
     __doc__ = vendored_pandas_multindex.MultiIndex.__doc__
@@ -36,25 +33,21 @@ def from_tuples(
         tuples: Iterable[tuple[Hashable, ...]],
         sortorder: int | None = None,
         names: Sequence[Hashable] | Hashable | None = None,
-        *,
-        session: Optional[bigframes.session.Session] = None,
     ) -> MultiIndex:
         pd_index = pandas.MultiIndex.from_tuples(tuples, sortorder, names)
         # Index.__new__ should detect multiple levels and properly create a multiindex
-        return cast(MultiIndex, Index(pd_index, session=session))
+        return cast(MultiIndex, Index(pd_index))
 
     @classmethod
     def from_arrays(
         cls,
         arrays,
         sortorder: int | None = None,
         names=None,
-        *,
-        session: Optional[bigframes.session.Session] = None,
     ) -> MultiIndex:
         pd_index = pandas.MultiIndex.from_arrays(arrays, sortorder, names)
         # Index.__new__ should detect multiple levels and properly create a multiindex
-        return cast(MultiIndex, Index(pd_index, session=session))
+        return cast(MultiIndex, Index(pd_index))
 
     def __eq__(self, other) -> Index:  # type: ignore
         import bigframes.operations as ops
@@ -78,38 +71,3 @@ def __eq__(self, other) -> Index:  # type: ignore
                 index_labels=[None],
             )
         )
-
-
-class MultiIndexAccessor:
-    """Proxy to MultiIndex constructors to allow a session to be passed in."""
-
-    def __init__(self, session: bigframes.session.Session):
-        self._session = session
-
-    def __call__(self, *args, **kwargs) -> MultiIndex:
-        """Construct a MultiIndex using the associated Session.
-
-        See :class:`bigframes.pandas.MultiIndex`.
-        """
-        return MultiIndex(*args, session=self._session, **kwargs)
-
-    def from_arrays(self, *args, **kwargs) -> MultiIndex:
-        """Construct a MultiIndex using the associated Session.
-
-        See :func:`bigframes.pandas.MultiIndex.from_arrays`.
-        """
-        return MultiIndex.from_arrays(*args, session=self._session, **kwargs)
-
-    def from_frame(self, *args, **kwargs) -> MultiIndex:
-        """Construct a MultiIndex using the associated Session.
-
-        See :func:`bigframes.pandas.MultiIndex.from_frame`.
-        """
-        return cast(MultiIndex, MultiIndex.from_frame(*args, **kwargs))
-
-    def from_tuples(self, *args, **kwargs) -> MultiIndex:
-        """Construct a MultiIndex using the associated Session.
-
-        See :func:`bigframes.pandas.MultiIndex.from_tuples`.
-        """
-        return MultiIndex.from_tuples(*args, session=self._session, **kwargs)

bigframes/core/log_adapter.py

@@ -155,9 +155,7 @@ def method_logger(method=None, /, *, custom_base_name: Optional[str] = None):
     def outer_wrapper(method):
         @functools.wraps(method)
         def wrapper(*args, **kwargs):
-            api_method_name = getattr(
-                method, LOG_OVERRIDE_NAME, method.__name__
-            ).lower()
+            api_method_name = getattr(method, LOG_OVERRIDE_NAME, method.__name__)
             if custom_base_name is None:
                 qualname_parts = getattr(method, "__qualname__", method.__name__).split(
                     "."

bigframes/core/reshape/tile.py

@@ -15,7 +15,6 @@
 from __future__ import annotations
 
 import typing
-from typing import Optional, TYPE_CHECKING
 
 import bigframes_vendored.constants as constants
 import bigframes_vendored.pandas.core.reshape.tile as vendored_pandas_tile
@@ -32,9 +31,6 @@
 import bigframes.operations.aggregations as agg_ops
 import bigframes.series
 
-if TYPE_CHECKING:
-    import bigframes.session
-
 
 def cut(
     x,
@@ -46,7 +42,6 @@ def cut(
     *,
     right: typing.Optional[bool] = True,
     labels: typing.Union[typing.Iterable[str], bool, None] = None,
-    session: Optional[bigframes.session.Session] = None,
 ) -> bigframes.series.Series:
     if (
         labels is not None
@@ -70,7 +65,7 @@ def cut(
         raise ValueError("Cannot cut empty array.")
 
     if not isinstance(x, bigframes.series.Series):
-        x = bigframes.series.Series(x, session=session)
+        x = bigframes.series.Series(x)
 
     if isinstance(bins, int):
         if bins <= 0:

bigframes/core/tools/datetimes.py

@@ -12,11 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import annotations
-
 from collections.abc import Mapping
 from datetime import date, datetime
-from typing import Optional, TYPE_CHECKING, Union
+from typing import Optional, Union
 
 import bigframes_vendored.constants as constants
 import bigframes_vendored.pandas.core.tools.datetimes as vendored_pandas_datetimes
@@ -27,9 +25,6 @@
 import bigframes.operations as ops
 import bigframes.series
 
-if TYPE_CHECKING:
-    import bigframes.session
-
 
 def to_datetime(
     arg: Union[
@@ -42,7 +37,6 @@ def to_datetime(
     utc: bool = False,
     format: Optional[str] = None,
     unit: Optional[str] = None,
-    session: Optional[bigframes.session.Session] = None,
 ) -> Union[pd.Timestamp, datetime, bigframes.series.Series]:
     if isinstance(arg, (int, float, str, datetime, date)):
         return pd.to_datetime(
@@ -58,7 +52,7 @@ def to_datetime(
             f"to datetime is not implemented. {constants.FEEDBACK_LINK}"
         )
 
-    arg = bigframes.series.Series(arg, session=session)
+    arg = bigframes.series.Series(arg)
 
     if format and unit and arg.dtype in (bigframes.dtypes.INT_DTYPE, bigframes.dtypes.FLOAT_DTYPE):  # type: ignore
         raise ValueError("cannot specify both format and unit")

bigframes/pandas/__init__.py

@@ -16,8 +16,8 @@
 
 from __future__ import annotations
 
-import collections
-import datetime
+from collections import namedtuple
+from datetime import date, datetime
 import inspect
 import sys
 import typing
@@ -198,18 +198,18 @@ def to_datetime(
 
 @typing.overload
 def to_datetime(
-    arg: Union[int, float, str, datetime.datetime, datetime.date],
+    arg: Union[int, float, str, datetime, date],
     *,
     utc: bool = False,
     format: Optional[str] = None,
     unit: Optional[str] = None,
-) -> Union[pandas.Timestamp, datetime.datetime]:
+) -> Union[pandas.Timestamp, datetime]:
     ...
 
 
 def to_datetime(
     arg: Union[
-        Union[int, float, str, datetime.datetime, datetime.date],
+        Union[int, float, str, datetime, date],
         vendored_pandas_datetimes.local_iterables,
         bigframes.series.Series,
         bigframes.dataframe.DataFrame,
@@ -218,9 +218,8 @@ def to_datetime(
     utc: bool = False,
     format: Optional[str] = None,
     unit: Optional[str] = None,
-) -> Union[pandas.Timestamp, datetime.datetime, bigframes.series.Series]:
-    return global_session.with_default_session(
-        bigframes.session.Session.to_datetime,
+) -> Union[pandas.Timestamp, datetime, bigframes.series.Series]:
+    return bigframes.core.tools.to_datetime(
         arg,
         utc=utc,
         format=format,
@@ -323,7 +322,7 @@ def clean_up_by_session_id(
 __version__ = bigframes.version.__version__
 
 # Other public pandas attributes
-NamedAgg = collections.namedtuple("NamedAgg", ["column", "aggfunc"])
+NamedAgg = namedtuple("NamedAgg", ["column", "aggfunc"])
 
 options = config.options
 """Global :class:`~bigframes._config.Options` to configure BigQuery DataFrames."""