dataframe-textual 0.3.0__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,6 +1,9 @@
 """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
@@ -33,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):
@@ -87,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()
@@ -120,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:
@@ -169,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
@@ -283,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.3.0.dist-info → dataframe_textual-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataframe-textual
-Version: 0.3.0
+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

{dataframe_textual-0.3.0.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=uD98fGcvuMjL8WSbwwCV6a_YyuGlyJ364JnaL1dHwQ0,10807
+dataframe_textual/table_screen.py,sha256=elY0gBdc0PQlh82N7lu3FHeVoFprqd-8iUBVvfSdah0,11015
 dataframe_textual/yes_no_screen.py,sha256=z7MEVTMepFuGWFIthhQlAT3m69D6lgIl4tb2_oJAWWQ,13207
-dataframe_textual-0.3.0.dist-info/METADATA,sha256=WM9nEZTY11crnSJmVtZ02J-7SWTTOp-yPGrmlSWg7TQ,17109
-dataframe_textual-0.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dataframe_textual-0.3.0.dist-info/entry_points.txt,sha256=FkXDHVYYtGud6F2Jm2X9OMFAuFrSflNfgcNP5c2469M,70
-dataframe_textual-0.3.0.dist-info/licenses/LICENSE,sha256=AVTg0gk1X-LHI-nnHlAMDQetrwuDZK4eypgSMDO46Yc,1069
-dataframe_textual-0.3.0.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,,