dataframe-textual 0.2.1__py3-none-any.whl → 0.3.1__py3-none-any.whl

dataframe_textual/data_frame_table.py

@@ -549,7 +549,7 @@ class DataFrameTable(DataTable):
             return
 
         # Push the modal screen
-        self.app.push_screen(RowDetailScreen(row_idx, self.df))
+        self.app.push_screen(RowDetailScreen(row_idx, self))
 
     def _show_frequency(self) -> None:
         """Show frequency distribution for the current column."""
@@ -558,9 +558,7 @@ class DataFrameTable(DataTable):
             return
 
         # Push the frequency modal screen
-        self.app.push_screen(
-            FrequencyScreen(col_idx, self.df.filter(self.visible_rows))
-        )
+        self.app.push_screen(FrequencyScreen(col_idx, self))
 
     def _open_freeze_screen(self) -> None:
         """Open the freeze screen to set fixed rows and columns."""

dataframe_textual/table_screen.py

@@ -1,11 +1,15 @@
 """Modal screens for displaying data in tables (row details and frequency)."""
 
-from typing import Any
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+    from .data_frame_table import DataFrameTable
 
 import polars as pl
 from rich.text import Text
 from textual.app import ComposeResult
 from textual.coordinate import Coordinate
+from textual.renderables.bar import Bar
 from textual.screen import ModalScreen
 from textual.widgets import DataTable
 
@@ -32,14 +36,14 @@ class TableScreen(ModalScreen):
         }
     """
 
-    def __init__(self, df: pl.DataFrame, id: str | None = None):
+    def __init__(self, dftable: DataFrameTable):
         super().__init__()
-        self.df = df
-        self.id = id
+        self.df: pl.DataFrame = dftable.df  # Polars DataFrame
+        self.dftable = dftable  # DataFrameTable
 
     def compose(self) -> ComposeResult:
         """Create the table. Must be overridden by subclasses."""
-        self.table = DataTable(zebra_stripes=True, id=self.id)
+        self.table = DataTable(zebra_stripes=True)
         yield self.table
 
     def on_key(self, event):
@@ -86,27 +90,26 @@ class TableScreen(ModalScreen):
             expr = pl.col(col_name) == col_value
             value_display = f"[on $primary]{col_value}[/]"
 
-        app = self.app
         matched_indices = set(
-            app.df.with_row_index("__rid__").filter(expr)["__rid__"].to_list()
+            self.dftable.df.with_row_index("__rid__").filter(expr)["__rid__"].to_list()
         )
 
         # Apply the action
         if action == "filter":
             # Update visible_rows to reflect the filter
-            for i in range(len(app.visible_rows)):
-                app.visible_rows[i] = i in matched_indices
+            for i in range(len(self.dftable.visible_rows)):
+                self.dftable.visible_rows[i] = i in matched_indices
             title = "Filter"
             message = f"Filtered by [on $primary]{col_name}[/] = {value_display}"
         else:  # action == "highlight"
             # Update selected_rows to reflect the highlights
-            for i in range(len(app.selected_rows)):
-                app.selected_rows[i] = i in matched_indices
+            for i in range(len(self.dftable.selected_rows)):
+                self.dftable.selected_rows[i] = i in matched_indices
             title = "Highlight"
             message = f"Highlighted [on $primary]{col_name}[/] = {value_display}"
 
         # Recreate the table display with updated data in the main app
-        app._setup_table()
+        self.dftable._setup_table()
 
         # Dismiss the frequency screen
         self.app.pop_screen()
@@ -119,8 +122,8 @@ class RowDetailScreen(TableScreen):
 
     CSS = TableScreen.DEFAULT_CSS.replace("TableScreen", "RowDetailScreen")
 
-    def __init__(self, row_idx: int, df: pl.DataFrame):
-        super().__init__(df, id="row-detail-table")
+    def __init__(self, row_idx: int, dftable):
+        super().__init__(dftable)
         self.row_idx = row_idx
 
     def on_mount(self) -> None:
@@ -136,6 +139,8 @@ class RowDetailScreen(TableScreen):
                 *_format_row([col, val], [None, dtype], apply_justify=False)
             )
 
+        self.table.cursor_type = "row"
+
     def on_key(self, event):
         if event.key == "v":
             # Filter the main table by the selected value
@@ -166,8 +171,8 @@ class FrequencyScreen(TableScreen):
 
     CSS = TableScreen.DEFAULT_CSS.replace("TableScreen", "FrequencyScreen")
 
-    def __init__(self, col_idx: int, df: pl.DataFrame):
-        super().__init__(df, id="frequency-table")
+    def __init__(self, col_idx: int, dftable):
+        super().__init__(dftable)
         self.col_idx = col_idx
         self.sorted_columns = {
             1: True,  # Count
@@ -188,6 +193,7 @@ class FrequencyScreen(TableScreen):
         self.table.add_column(Text(column, justify=dc.justify), key=column)
         self.table.add_column(Text("Count", justify="right"), key="Count")
         self.table.add_column(Text("%", justify="right"), key="%")
+        self.table.add_column(Text("Histogram", justify="left"), key="Histogram")
 
         # Get style config for Int64 and Float64
         ds_int = DtypeConfig("Int64")
@@ -204,16 +210,16 @@ class FrequencyScreen(TableScreen):
                     style=dc.style,
                     justify=dc.justify,
                 ),
-                Text(
-                    str(count),
-                    style=ds_int.style,
-                    justify=ds_int.justify,
-                ),
+                Text(str(count), style=ds_int.style, justify=ds_int.justify),
                 Text(
                     f"{percentage:.2f}",
                     style=ds_float.style,
                     justify=ds_float.justify,
                 ),
+                Bar(
+                    highlight_range=(0.0, percentage / 100 * 10),
+                    width=10,
+                ),
                 key=str(row_idx + 1),
             )
 
@@ -279,14 +285,17 @@ class FrequencyScreen(TableScreen):
         def key_fun(freq_col):
             col_value = freq_col.plain
 
-            if col_dtype == "Int64":
-                return int(col_value)
-            elif col_dtype == "Float64":
-                return float(col_value)
-            elif col_dtype == "Boolean":
-                return BOOLS[col_value]
-            else:
-                return col_value
+            try:
+                if col_dtype == "Int64":
+                    return int(col_value)
+                elif col_dtype == "Float64":
+                    return float(col_value)
+                elif col_dtype == "Boolean":
+                    return BOOLS[col_value]
+                else:
+                    return col_value
+            except ValueError:
+                return 0
 
         # Sort the table
         freq_table.sort(

{dataframe_textual-0.2.1.dist-info → dataframe_textual-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataframe-textual
-Version: 0.2.1
+Version: 0.3.1
 Summary: Interactive CSV/Excel viewer for the terminal (Textual TUI)
 Project-URL: Homepage, https://github.com/need47/dataframe-textual
 Project-URL: Repository, https://github.com/need47/dataframe-textual.git
@@ -9,7 +9,7 @@ Project-URL: Bug Tracker, https://github.com/need47/dataframe-textual/issues
 Author-email: Tiejun Cheng <need47@gmail.com>
 License: MIT
 License-File: LICENSE
-Keywords: csv,data-analysis,interactive,polars,terminal,textual,tui,viewer
+Keywords: csv,data-analysis,excel,interactive,polars,terminal,textual,tui,viewer
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -29,7 +29,6 @@ Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
 Requires-Python: >=3.11
 Requires-Dist: polars>=1.34.0
-Requires-Dist: rich>=14.2.0
 Requires-Dist: textual>=1.0.0
 Provides-Extra: dev
 Requires-Dist: textual-dev>=1.8.0; extra == 'dev'

{dataframe_textual-0.2.1.dist-info → dataframe_textual-0.3.1.dist-info}/RECORD

@@ -2,12 +2,12 @@ dataframe_textual/__init__.py,sha256=uzB3bjlbm8JbsjxEgwqvPcYERktm3F9d9Op_6cWJ1sk
 dataframe_textual/__main__.py,sha256=LPLyZcv4hAFfF3hUt1S2dtZOqaAZnlguicgwiDrtXgk,1349
 dataframe_textual/common.py,sha256=3zzhI__F_hoOFDRe-wt-oTfMDFik1ohraIa6rXcVit8,6357
 dataframe_textual/data_frame_help_panel.py,sha256=SQ2lulb1SPxItR9tMvIgOzzeCcW9SB1rRojAcwZ7Vis,2730
-dataframe_textual/data_frame_table.py,sha256=u_gMc-U57efgIRoCfOR65clieK7M7FUg45jjUb06V_w,50079
+dataframe_textual/data_frame_table.py,sha256=8CCTwhi0cYPr9yEuMlv76rzPT48PzxyjsCIP2P3g3_c,50025
 dataframe_textual/data_frame_viewer.py,sha256=BP-pCYIG5bEDFkUmUyA3sxWc3z1zI_viClDZlT-s_uE,11715
-dataframe_textual/table_screen.py,sha256=Pq6aM-vntDxLj1r5Uzke6_pzbuhO-VrX_V12ezwm3uM,10588
+dataframe_textual/table_screen.py,sha256=elY0gBdc0PQlh82N7lu3FHeVoFprqd-8iUBVvfSdah0,11015
 dataframe_textual/yes_no_screen.py,sha256=z7MEVTMepFuGWFIthhQlAT3m69D6lgIl4tb2_oJAWWQ,13207
-dataframe_textual-0.2.1.dist-info/METADATA,sha256=jACe80kpq-4nzJZ0Ra5MwSnezCOMbJb4hTe9obRUWaI,17131
-dataframe_textual-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dataframe_textual-0.2.1.dist-info/entry_points.txt,sha256=FkXDHVYYtGud6F2Jm2X9OMFAuFrSflNfgcNP5c2469M,70
-dataframe_textual-0.2.1.dist-info/licenses/LICENSE,sha256=AVTg0gk1X-LHI-nnHlAMDQetrwuDZK4eypgSMDO46Yc,1069
-dataframe_textual-0.2.1.dist-info/RECORD,,
+dataframe_textual-0.3.1.dist-info/METADATA,sha256=nmpsgfqdd5E9RAe3rMwI_qkX3V_n_k_bVFP-DX9bAzY,17109
+dataframe_textual-0.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dataframe_textual-0.3.1.dist-info/entry_points.txt,sha256=FkXDHVYYtGud6F2Jm2X9OMFAuFrSflNfgcNP5c2469M,70
+dataframe_textual-0.3.1.dist-info/licenses/LICENSE,sha256=AVTg0gk1X-LHI-nnHlAMDQetrwuDZK4eypgSMDO46Yc,1069
+dataframe_textual-0.3.1.dist-info/RECORD,,