Revert "refactor: Update display configuration handling in DataFrame"

This reverts commit 0d5e900.

Author: kosiew

python/datafusion/dataframe.py

@@ -823,10 +823,6 @@ def configure_display(
     ) -> None:
         """Configure display options for DataFrame representation.
 
-        Note: The display configuration is now set at the session context level,
-        so changes to one DataFrame's display configuration will affect all
-        DataFrames created from the same context.
-
         Args:
             max_table_bytes: Maximum bytes to display for table presentation
                              (default: 2MB).

python/tests/test_dataframe.py

@@ -1367,9 +1367,9 @@ def test_min_table_rows_display(ctx):
     row_count = html_output.count("<tr>") - 1  # subtract 1 for the header row
 
     # Verify at least min_table_rows rows are displayed
-    assert (
-        row_count >= custom_min_rows
-    ), f"Expected at least {custom_min_rows} rows, got {row_count}"
+    assert row_count >= custom_min_rows, (
+        f"Expected at least {custom_min_rows} rows, got {row_count}"
+    )
 
     # If data was truncated, "Data truncated" message should be present
     if row_count < rows:
@@ -1542,63 +1542,3 @@ def test_max_table_rows_in_repr(ctx):
     # Should show all rows (20)
     assert lines_all == rows
     assert "Data truncated" not in repr_str_all
-
-
-def test_session_context_display_config(ctx):
-    """Test that display configuration is shared at session context level."""
-    # Create two dataframes from the same context
-    batch1 = pa.RecordBatch.from_arrays(
-        [pa.array([1, 2, 3]), pa.array([4, 5, 6])],
-        names=["a", "b"],
-    )
-    df1 = ctx.create_dataframe([[batch1]])
-
-    batch2 = pa.RecordBatch.from_arrays(
-        [pa.array([7, 8, 9]), pa.array([10, 11, 12])],
-        names=["c", "d"],
-    )
-    df2 = ctx.create_dataframe([[batch2]])
-
-    # Set display config on first dataframe
-    custom_max_rows = 25
-    df1.configure_display(max_table_rows_in_repr=custom_max_rows)
-
-    # Check that both dataframes have the same config
-    assert df1.display_config.max_table_rows_in_repr == custom_max_rows
-    assert df2.display_config.max_table_rows_in_repr == custom_max_rows
-
-    # Change config on second dataframe
-    df2.configure_display(max_cell_length=40)
-
-    # Both dataframes should reflect the change
-    assert df1.display_config.max_cell_length == 40
-    assert df2.display_config.max_cell_length == 40
-
-
-def test_session_context_display_config_independence(ctx):
-    """Test that display configurations in different contexts are independent."""
-    # Create two contexts with different configurations
-    ctx1 = SessionContext()
-    ctx2 = SessionContext()
-
-    # Create dataframes from each context
-    batch = pa.RecordBatch.from_arrays(
-        [pa.array([1, 2, 3]), pa.array([4, 5, 6])],
-        names=["a", "b"],
-    )
-    df1 = ctx1.create_dataframe([[batch]])
-    df2 = ctx2.create_dataframe([[batch]])
-
-    # Set different display configurations
-    df1.configure_display(max_table_rows_in_repr=15)
-    df2.configure_display(max_table_rows_in_repr=30)
-
-    # Verify configurations are independent
-    assert df1.display_config.max_table_rows_in_repr == 15
-    assert df2.display_config.max_table_rows_in_repr == 30
-
-    # Create another dataframe from first context
-    df3 = ctx1.create_dataframe([[batch]])
-
-    # It should have the same config as the first dataframe
-    assert df3.display_config.max_table_rows_in_repr == 15

src/dataframe.rs

@@ -135,10 +135,10 @@ pub struct PyDataFrame {
 
 impl PyDataFrame {
     /// creates a new PyDataFrame
-    pub fn new(df: DataFrame, display_config: Arc<DisplayConfig>) -> Self {
+    pub fn new(df: DataFrame) -> Self {
         Self {
             df: Arc::new(df),
-            config: display_config,
+            config: Arc::new(DisplayConfig::default()),
         }
     }
 }
@@ -858,7 +858,10 @@ impl PyDataFrame {
     /// Get the current display configuration
     #[getter]
     fn display_config(&self) -> PyResult<Py<DisplayConfig>> {
-        Python::with_gil(|py| Py::new(py, (*self.display_config).clone()))
+        Python::with_gil(|py| {
+            let config = (*self.config).clone();
+            Py::new(py, config)
+        })
     }
 
     /// Update display configuration
@@ -875,7 +878,7 @@ impl PyDataFrame {
         max_cell_length: Option<usize>,
         max_table_rows_in_repr: Option<usize>,
     ) {
-        let mut new_config = (*self.display_config).clone();
+        let mut new_config = (*self.config).clone();
 
         if let Some(bytes) = max_table_bytes {
             new_config.max_table_bytes = bytes;
@@ -893,13 +896,13 @@ impl PyDataFrame {
             new_config.max_table_rows_in_repr = rows;
         }
 
-        self.display_config = Arc::new(new_config);
+        self.config = Arc::new(new_config);
     }
 
     /// Reset display configuration to default values
     #[pyo3(text_signature = "($self)")]
     fn reset_display_config(&mut self) {
-        self.display_config = Arc::new(DisplayConfig::default());
+        self.config = Arc::new(DisplayConfig::default());
     }
 }