Revert "refactor: move code to plaintext file and add checks"

This reverts commit 593f9ae.

Author: shuoweil

bigframes/dataframe.py

@@ -796,7 +796,9 @@ def __repr__(self) -> str:
         )
 
         self._set_internal_query_job(query_job)
-        return self._create_text_representation(pandas_df, row_count)
+        from bigframes.display import html
+
+        return html.create_text_representation(self, pandas_df, row_count)
 
     def _get_display_df_and_blob_cols(self) -> tuple[DataFrame, list[str]]:
         """Process blob columns for display."""
@@ -824,40 +826,6 @@ def _repr_mimebundle_(self, include=None, exclude=None):
 
         return html.repr_mimebundle(self, include=include, exclude=exclude)
 
-    def _create_text_representation(
-        self,
-        pandas_df: pandas.DataFrame,
-        total_rows: typing.Optional[int],
-    ) -> str:
-        """Create a text representation of the DataFrame."""
-        opts = bigframes.options.display
-        with display_options.pandas_repr(opts):
-            import pandas.io.formats
-
-            to_string_kwargs = (
-                pandas.io.formats.format.get_dataframe_repr_params()  # type: ignore
-            )
-            if not self._has_index:
-                to_string_kwargs.update({"index": False})
-            to_string_kwargs.update({"show_dimensions": False})
-            repr_string = pandas_df.to_string(**to_string_kwargs)
-
-        lines = repr_string.split("\n")
-        is_truncated = total_rows is not None and total_rows > len(pandas_df)
-
-        if is_truncated:
-            lines.append("...")
-            lines.append("")  # Add empty line for spacing only if truncated
-            column_count = len(self.columns)
-            lines.append(f"[{total_rows or '?'} rows x {column_count} columns]")
-        else:
-            # For non-truncated DataFrames, we still need to add dimensions if show_dimensions was False
-            column_count = len(self.columns)
-            lines.append("")
-            lines.append(f"[{total_rows or '?'} rows x {column_count} columns]")
-
-        return "\n".join(lines)
-
     def _create_html_representation(
         self,
         pandas_df: pandas.DataFrame,

bigframes/display/html.py

@@ -18,17 +18,16 @@
 
 import html
 import traceback
+import typing
 from typing import Any, Union
 import warnings
 
 import pandas as pd
 import pandas.api.types
 
 import bigframes
-from bigframes._config import options
+from bigframes._config import display_options, options
 import bigframes.dataframe
-from bigframes.display import plaintext
-import bigframes.formatting_helpers
 import bigframes.series
 
 
@@ -100,6 +99,53 @@ def render_html(
     return "\n".join(table_html)
 
 
+def create_text_representation(
+    obj: Union[bigframes.dataframe.DataFrame, bigframes.series.Series],
+    pandas_df: pd.DataFrame,
+    total_rows: typing.Optional[int],
+) -> str:
+    """Create a text representation of the DataFrame or Series."""
+    opts = bigframes.options.display
+    with display_options.pandas_repr(opts):
+        if isinstance(obj, bigframes.series.Series):
+            pd_series = pandas_df.iloc[:, 0]
+            if len(obj._block.index_columns) == 0:
+                repr_string = pd_series.to_string(
+                    length=False, index=False, name=True, dtype=True
+                )
+            else:
+                repr_string = pd_series.to_string(length=False, name=True, dtype=True)
+        else:
+            import pandas.io.formats
+
+            to_string_kwargs = (
+                pandas.io.formats.format.get_dataframe_repr_params()  # type: ignore
+            )
+            if not obj._has_index:
+                to_string_kwargs.update({"index": False})
+            to_string_kwargs.update({"show_dimensions": False})
+            repr_string = pandas_df.to_string(**to_string_kwargs)
+
+    lines = repr_string.split("\n")
+    is_truncated = total_rows is not None and total_rows > len(pandas_df)
+
+    if is_truncated:
+        lines.append("...")
+        lines.append("")  # Add empty line for spacing only if truncated
+        if isinstance(obj, bigframes.series.Series):
+            lines.append(f"[{total_rows} rows]")
+        else:
+            column_count = len(obj.columns)
+            lines.append(f"[{total_rows or '?'} rows x {column_count} columns]")
+    elif isinstance(obj, bigframes.dataframe.DataFrame):
+        # For non-truncated DataFrames, we still need to add dimensions if show_dimensions was False
+        column_count = len(obj.columns)
+        lines.append("")
+        lines.append(f"[{total_rows or '?'} rows x {column_count} columns]")
+
+    return "\n".join(lines)
+
+
 def create_html_representation(
     obj: Union[bigframes.dataframe.DataFrame, bigframes.series.Series],
     pandas_df: pd.DataFrame,
@@ -108,9 +154,17 @@ def create_html_representation(
     blob_cols: list[str],
 ) -> str:
     """Create an HTML representation of the DataFrame or Series."""
-    return obj._create_html_representation(
-        pandas_df, total_rows, total_columns, blob_cols
-    )
+    if isinstance(obj, bigframes.series.Series):
+        pd_series = pandas_df.iloc[:, 0]
+        try:
+            html_string = pd_series._repr_html_()
+        except AttributeError:
+            html_string = f"<pre>{pd_series.to_string()}</pre>"
+    else:
+        html_string = obj._create_html_representation(
+            pandas_df, total_rows, total_columns, blob_cols
+        )
+    return html_string
 
 
 def get_anywidget_bundle(
@@ -152,19 +206,19 @@ def get_anywidget_bundle(
         total_columns,
         blob_cols if "blob_cols" in locals() else [],
     )
-    widget_repr["text/plain"] = plaintext.create_text_representation(
-        obj, cached_pd, total_rows
-    )
+    widget_repr["text/plain"] = create_text_representation(obj, cached_pd, total_rows)
 
     return widget_repr, widget_metadata
 
 
-def repr_mimebundle_head(
+def repr_mimebundle(
     obj: Union[bigframes.dataframe.DataFrame, bigframes.series.Series],
     include=None,
     exclude=None,
 ):
-    """Mimebundle display for the start of the data."""
+    """
+    Custom display method for IPython/Jupyter environments.
+    """
     opts = bigframes.options.display
     if opts.repr_mode == "anywidget":
         try:
@@ -195,37 +249,6 @@ def repr_mimebundle_head(
         obj, pandas_df, row_count, column_count, blob_cols
     )
 
-    text_representation = plaintext.create_text_representation(
-        obj, pandas_df, row_count
-    )
+    text_representation = create_text_representation(obj, pandas_df, row_count)
 
     return {"text/html": html_string, "text/plain": text_representation}
-
-
-def repr_mimebundle_deferred(
-    obj: Union[bigframes.dataframe.DataFrame, bigframes.series.Series],
-    include=None,
-    exclude=None,
-):
-    """Mimebundle display for deferred execution mode."""
-    # We don't need the mimetype for the deferred case, but we need to match
-    # the signature of the other repr_mimebundle_* methods.
-    # TODO(swast): Add an HTML representation for deferred queries that simply
-    # prints the SQL.
-    query_job = obj._compute_dry_run()
-    text_representation = bigframes.formatting_helpers.repr_query_job(query_job)
-    return {"text/plain": text_representation}
-
-
-def repr_mimebundle(
-    obj: Union[bigframes.dataframe.DataFrame, bigframes.series.Series],
-    include=None,
-    exclude=None,
-):
-    """
-    Custom display method for IPython/Jupyter environments.
-    """
-    if options.display.repr_mode == "deferred":
-        return repr_mimebundle_deferred(obj, include=include, exclude=exclude)
-    else:
-        return repr_mimebundle_head(obj, include=include, exclude=exclude)

bigframes/series.py

@@ -577,54 +577,6 @@ def _repr_mimebundle_(self, include=None, exclude=None):
 
         return html.repr_mimebundle(self, include=include, exclude=exclude)
 
-    def _create_text_representation(
-        self,
-        pandas_df: pandas.DataFrame,
-        total_rows: typing.Optional[int],
-    ) -> str:
-        """Create a text representation of the Series."""
-        opts = bigframes.options.display
-        with bigframes._config.display_options.pandas_repr(opts):
-            pd_series = pandas_df.iloc[:, 0]
-            if len(self._block.index_columns) == 0:
-                repr_string = pd_series.to_string(
-                    length=False, index=False, name=True, dtype=True
-                )
-            else:
-                repr_string = pd_series.to_string(length=False, name=True, dtype=True)
-
-        lines = repr_string.split("\n")
-        is_truncated = total_rows is not None and total_rows > len(pandas_df)
-
-        if is_truncated:
-            lines.append("...")
-            lines.append("")  # Add empty line for spacing only if truncated
-            lines.append(f"[{total_rows} rows]")
-
-        return "\n".join(lines)
-
-    def _create_html_representation(
-        self,
-        pandas_df: pandas.DataFrame,
-        total_rows: int,
-        total_columns: int,
-        blob_cols: typing.List[str],
-    ) -> str:
-        """Create an HTML representation of the Series."""
-        pd_series = pandas_df.iloc[:, 0]
-        try:
-            # Not all pandas Series have a _repr_html_ method, so we fall back
-            # to a simple text representation in an HTML <pre> tag.
-            html_string = pd_series._repr_html_()
-        except AttributeError:
-            html_string = f"<pre>{pd_series.to_string()}</pre>"
-
-        is_truncated = total_rows is not None and total_rows > len(pandas_df)
-        if is_truncated:
-            html_string += f"<p>... [{total_rows} rows in total]</p>"
-
-        return html_string
-
     def __repr__(self) -> str:
         # Protect against errors with uninitialized Series. See:
         # https://github.com/googleapis/python-bigquery-dataframes/issues/728
@@ -635,11 +587,14 @@ def __repr__(self) -> str:
         if opts.repr_mode == "deferred":
             return formatter.repr_query_job(self._compute_dry_run())
 
+        self._cached()
         pandas_df, row_count, query_job = self._block.retrieve_repr_request_results(
             opts.max_rows
         )
         self._set_internal_query_job(query_job)
-        return self._create_text_representation(pandas_df, row_count)
+        from bigframes.display import html
+
+        return html.create_text_representation(self, pandas_df, row_count)
 
     def astype(
         self,