Revert "add todo and revert change"

This reverts commit 153e1d2.

Author: shuoweil

bigframes/dataframe.py

@@ -23,7 +23,6 @@
 import re
 import sys
 import textwrap
-import traceback
 import typing
 from typing import (
  Any,
@@ -783,9 +782,9 @@ def __repr__(self) -> str:
 
  opts = bigframes.options.display
  max_results = opts.max_rows
- # anywdiget mode uses the same display logic as the "deferred" mode
- # for faster execution
- if opts.repr_mode in ("deferred", "anywidget"):
+
+ # Only deferred mode shows dry run
+ if opts.repr_mode in ("deferred"):
  return formatter.repr_query_job(self._compute_dry_run())
 
  # TODO(swast): pass max_columns and get the true column count back. Maybe
@@ -851,27 +850,27 @@ def _repr_html_(self) -> str:
 
  if opts.repr_mode == "anywidget":
  try:
+ import anywidget # noqa: F401
  from IPython.display import display as ipython_display
+ import traitlets # noqa: F401
 
  from bigframes import display
-
- # Always create a new widget instance for each display call
- # This ensures that each cell gets its own widget and prevents
- # unintended sharing between cells
- widget = display.TableWidget(df.copy())
-
- ipython_display(widget)
- return "" # Return empty string since we used display()
-
- except (AttributeError, ValueError, ImportError):
- # Fallback if anywidget is not available
+ except ImportError:
  warnings.warn(
- "Anywidget mode is not available. "
+ "anywidget or its dependencies are not installed. "
  "Please `pip install anywidget traitlets` or `pip install 'bigframes[anywidget]'` to use interactive tables. "
- f"Falling back to deferred mode. Error: {traceback.format_exc()}"
+ "Falling back to deferred mode."
  )
  return formatter.repr_query_job(self._compute_dry_run())
 
+ # Always create a new widget instance for each display call
+ # This ensures that each cell gets its own widget and prevents
+ # unintended sharing between cells
+ widget = display.TableWidget(df.copy())
+
+ ipython_display(widget)
+ return "" # Return empty string since we used display()
+
  # Continue with regular HTML rendering for non-anywidget modes
  # TODO(swast): pass max_columns and get the true column count back. Maybe
  # get 1 more column than we have requested so that pandas can add the
@@ -2564,25 +2563,33 @@ def sort_index(
  ) -> None:
  ...
 
- @validations.requires_index
  def sort_index(
  self,
  *,
+ axis: Union[int, str] = 0,
  ascending: bool = True,
  inplace: bool = False,
  na_position: Literal["first", "last"] = "last",
  ) -> Optional[DataFrame]:
- if na_position not in ["first", "last"]:
- raise ValueError("Param na_position must be one of 'first' or 'last'")
- na_last = na_position == "last"
- index_columns = self._block.index_columns
- ordering = [
- order.ascending_over(column, na_last)
- if ascending
- else order.descending_over(column, na_last)
- for column in index_columns
- ]
- block = self._block.order_by(ordering)
+ if utils.get_axis_number(axis) == 0:
+ if na_position not in ["first", "last"]:
+ raise ValueError("Param na_position must be one of 'first' or 'last'")
+ na_last = na_position == "last"
+ index_columns = self._block.index_columns
+ ordering = [
+ order.ascending_over(column, na_last)
+ if ascending
+ else order.descending_over(column, na_last)
+ for column in index_columns
+ ]
+ block = self._block.order_by(ordering)
+ else: # axis=1
+ _, indexer = self.columns.sort_values(
+ return_indexer=True, ascending=ascending, na_position=na_position # type: ignore
+ )
+ block = self._block.select_columns(
+ [self._block.value_columns[i] for i in indexer]
+ )
  if inplace:
  self._set_block(block)
  return None

bigframes/display/anywidget.py

@@ -191,9 +191,6 @@ def _reset_batches_for_new_page_size(self):
 
  def _set_table_html(self):
  """Sets the current html data based on the current page and page size."""
- # TODO (shuowei): BigFrames Series with db_dtypes.JSONArrowType column
- # fails to convert to pandas DataFrame in anywidget environment due to
- # missing handling in to_pandas_batches(). b/453561268
  # For empty dataframe, render empty table with headers.
  if self.row_count == 0:
  page_data = self._cached_data