fix errors

Author: TrevorBergeron

bigframes/core/indexes/base.py

@@ -778,6 +778,11 @@ def to_list(self, *, allow_large_results: Optional[bool] = None) -> list:
     def __len__(self):
         return self.shape[0]
 
+    def __bool__(self):
+        raise ValueError(
+            "Cannot convert Index into bool. Consider using .empty(), .item(), .any(), or .all() methods."
+        )
+
     def item(self):
         # Docstring is in third_party/bigframes_vendored/pandas/core/indexes/base.py
         return self.to_series().peek(2).item()

bigframes/dataframe.py

@@ -388,6 +388,11 @@ def __len__(self):
         rows, _ = self.shape
         return rows
 
+    def __bool__(self):
+        raise ValueError(
+            "Cannot convert dataframe into bool. Consider using .empty(), .any(), or .all() methods."
+        )
+
     def __iter__(self):
         return iter(self.columns)
 

bigframes/series.py

@@ -359,6 +359,11 @@ def _set_internal_query_job(self, query_job: Optional[bigquery.QueryJob]):
     def __len__(self):
         return self.shape[0]
 
+    def __bool__(self):
+        raise ValueError(
+            "Cannot convert Series into bool. Consider using .empty(), .item(), .any(), or .all() methods."
+        )
+
     def __iter__(self) -> typing.Iterator:
         return itertools.chain.from_iterable(
             map(lambda x: x.squeeze(axis=1), self._block.to_pandas_batches())

third_party/bigframes_vendored/pandas/core/computation/align.py

@@ -5,7 +5,7 @@
 from __future__ import annotations
 
 from functools import partial, wraps
-from typing import Callable, TYPE_CHECKING
+from typing import Callable, TYPE_CHECKING, Union
 import warnings
 
 import bigframes_vendored.pandas.core.common as com
@@ -17,15 +17,18 @@
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
-    from bigframes_vendored.pandas.core.generic import NDFrame
     from bigframes_vendored.pandas.core.indexes.base import Index
     from pandas._typing import F
 
+    from bigframes.pandas import DataFrame, Series
+
+    FrameT = Union[Series, DataFrame]
+
 
 def _align_core_single_unary_op(
     term,
-) -> tuple[partial | type[NDFrame], dict[str, Index] | None]:
-    typ: partial | type[NDFrame]
+) -> tuple[partial | FrameT, dict[str, Index] | None]:
+    typ: partial | FrameT
     axes: dict[str, Index] | None = None
 
     if isinstance(term.value, np.ndarray):
@@ -38,9 +41,7 @@ def _align_core_single_unary_op(
     return typ, axes
 
 
-def _zip_axes_from_type(
-    typ: type[NDFrame], new_axes: Sequence[Index]
-) -> dict[str, Index]:
+def _zip_axes_from_type(typ: FrameT, new_axes: Sequence[Index]) -> dict[str, Index]:
     return {name: new_axes[i] for i, name in enumerate(typ._AXIS_ORDERS)}
 
 
@@ -207,20 +208,18 @@ def is_series(obj) -> bool:
 
 
 def is_series_or_dataframe(obj) -> bool:
-    from bigframes_vendored.pandas.core.frame import NDFrame
+    from bigframes.pandas import DataFrame, Series
 
-    return isinstance(obj, NDFrame)
+    return isinstance(obj, Series | DataFrame)
 
 
 def is_pandas_object(obj) -> bool:
-    from bigframes_vendored.pandas.core.frame import NDFrame
-    from bigframes_vendored.pandas.core.indexes.base import Index
+    from bigframes.pandas import DataFrame, Index, Series
 
-    return isinstance(obj, NDFrame) or isinstance(obj, Index)
+    return isinstance(obj, Series | DataFrame | Index)
 
 
 def is_pandas_type(type) -> bool:
-    from bigframes_vendored.pandas.core.frame import NDFrame
-    from bigframes_vendored.pandas.core.indexes.base import Index
+    from bigframes.pandas import DataFrame, Index, Series
 
-    return issubclass(type, NDFrame) or issubclass(type, Index)
+    return issubclass(type, Series | DataFrame | Index)

third_party/bigframes_vendored/pandas/core/computation/eval.py

@@ -12,7 +12,6 @@
 from bigframes_vendored.pandas.core.computation.expr import Expr, PARSERS
 from bigframes_vendored.pandas.core.computation.parsing import tokenize_string
 from bigframes_vendored.pandas.core.computation.scope import ensure_scope
-from bigframes_vendored.pandas.core.generic import NDFrame
 from bigframes_vendored.pandas.util._validators import validate_bool_kwarg
 from pandas.io.formats.printing import pprint_thing
 
@@ -317,14 +316,16 @@ def eval(
 
         # assign if needed
         assigner = parsed_expr.assigner
+        from bigframes.pandas import DataFrame, Series
+
         if env.target is not None and assigner is not None:
             target_modified = True
 
             # if returning a copy, copy only on the first assignment
             if not inplace and first_expr:
                 try:
                     target = env.target
-                    if isinstance(target, NDFrame):
+                    if isinstance(target, Series | DataFrame):
                         target = target.copy()
                 except AttributeError as err:
                     raise ValueError("Cannot return a copy of the target") from err
@@ -338,7 +339,7 @@ def eval(
             try:
                 with warnings.catch_warnings(record=True):
                     # TODO: Filter the warnings we actually care about here.
-                    if inplace and isinstance(target, NDFrame):
+                    if inplace and isinstance(target, Series | DataFrame):
                         target.loc[:, assigner] = ret
                     else:
                         target[  # pyright: ignore[reportGeneralTypeIssues]

third_party/bigframes_vendored/pandas/core/generic.py

@@ -1229,15 +1229,6 @@ def pipe(
         """
         return common.pipe(self, func, *args, **kwargs)
 
-    def __nonzero__(self):
-        """Returns the truth value of the object."""
-        raise ValueError(
-            f"The truth value of a {type(self).__name__} is ambiguous. "
-            "Use a.empty, a.bool(), a.item(), a.any() or a.all()."
-        )
-
-    __bool__ = __nonzero__
-
     def __getattr__(self, name: str):
         """
         After regular attribute access, try looking up the name