dataframe-textual 1.1.5__py3-none-any.whl → 1.3.9__py3-none-any.whl

dataframe_textual/common.py

@@ -133,7 +133,7 @@ def format_float(value: float, thousand_separator: bool = False, precision: int
             return f"{value:,f}" if thousand_separator else str(value)
 
 
-def format_row(vals, dtypes, apply_justify=True, thousand_separator=False) -> list[Text]:
+def format_row(vals, dtypes, styles=None, apply_justify=True, thousand_separator=False) -> list[Text]:
     """Format a single row with proper styling and justification.
 
     Converts raw row values to formatted Rich Text objects with appropriate
@@ -149,7 +149,7 @@ def format_row(vals, dtypes, apply_justify=True, thousand_separator=False) -> li
     """
     formatted_row = []
 
-    for val, dtype in zip(vals, dtypes, strict=True):
+    for idx, (val, dtype) in enumerate(zip(vals, dtypes, strict=True)):
         dc = DtypeConfig(dtype)
 
         # Format the value
@@ -165,7 +165,7 @@ def format_row(vals, dtypes, apply_justify=True, thousand_separator=False) -> li
         formatted_row.append(
             Text(
                 text_val,
-                style=dc.style,
+                style=styles[idx] if styles and styles[idx] else dc.style,
                 justify=dc.justify if apply_justify else "",
             )
         )
@@ -216,7 +216,7 @@ def get_next_item(lst: list[Any], current, offset=1) -> Any:
     return lst[next_index]
 
 
-def parse_polars_expression(expression: str, df: pl.DataFrame, current_col_idx: int) -> str:
+def parse_polars_expression(expression: str, columns: list[str], current_col_idx: int) -> str:
     """Parse and convert an expression to Polars syntax.
 
     Replaces column references with Polars col() expressions:
@@ -234,7 +234,7 @@ def parse_polars_expression(expression: str, df: pl.DataFrame, current_col_idx:
 
     Args:
         expression: The input expression as a string.
-        df: The DataFrame to validate column references.
+        columns: The list of column names in the DataFrame.
         current_col_idx: The index of the currently selected column (0-based). Used for $_ reference.
 
     Returns:
@@ -264,19 +264,19 @@ def parse_polars_expression(expression: str, df: pl.DataFrame, current_col_idx:
 
         if col_ref == "_":
             # Current selected column
-            col_name = df.columns[current_col_idx]
+            col_name = columns[current_col_idx]
         elif col_ref == "#":
             # RIDX is used to store 0-based row index; add 1 for 1-based index
             return f"(pl.col('{RIDX}') + 1)"
         elif col_ref.isdigit():
             # Column by 1-based index
             col_idx = int(col_ref) - 1
-            if col_idx < 0 or col_idx >= len(df.columns):
+            if col_idx < 0 or col_idx >= len(columns):
                 raise ValueError(f"Column index out of range: ${col_ref}")
-            col_name = df.columns[col_idx]
+            col_name = columns[col_idx]
         else:
             # Column by name
-            if col_ref not in df.columns:
+            if col_ref not in columns:
                 raise ValueError(f"Column not found: ${col_ref}")
             col_name = col_ref
 
@@ -305,7 +305,7 @@ def tentative_expr(term: str) -> bool:
     return False
 
 
-def validate_expr(term: str, df: pl.DataFrame, current_col_idx: int) -> pl.Expr | None:
+def validate_expr(term: str, columns: list[str], current_col_idx: int) -> pl.Expr | None:
     """Validate and return the expression.
 
     Parses a user-provided expression string and validates it as a valid Polars expression.
@@ -313,7 +313,7 @@ def validate_expr(term: str, df: pl.DataFrame, current_col_idx: int) -> pl.Expr
 
     Args:
         term: The input expression as a string.
-        df: The DataFrame to validate column references against.
+        columns: The list of column names in the DataFrame.
         current_col_idx: The index of the currently selected column (0-based). Used for $_ reference.
 
     Returns:
@@ -326,7 +326,7 @@ def validate_expr(term: str, df: pl.DataFrame, current_col_idx: int) -> pl.Expr
 
     try:
         # Parse the expression
-        expr_str = parse_polars_expression(term, df, current_col_idx)
+        expr_str = parse_polars_expression(term, columns, current_col_idx)
 
         # Validate by evaluating it
         try:
@@ -440,6 +440,9 @@ def load_file(
         sources.append((lf, filename, filepath.stem))
     else:
         ext = filepath.suffix.lower()
+        if ext == ".gz" or ext == ".bz2" or ext == ".xz":
+            ext = filepath.with_suffix("").suffix.lower()
+
         if ext == ".csv":
             file_format = "csv"
         elif ext in (".xlsx", ".xls"):
@@ -459,3 +462,21 @@ def load_file(
         sources.extend(load_file(filename, first_sheet, prefix_sheet, file_format, has_header))
 
     return sources
+
+
+def now() -> str:
+    """Get the current local time as a formatted string."""
+    import time
+
+    return time.strftime("%m/%d/%Y %H:%M:%S", time.localtime())
+
+
+async def sleep_async(seconds: float) -> None:
+    """Async sleep to yield control back to the event loop.
+
+    Args:
+        seconds: The number of seconds to sleep.
+    """
+    import asyncio
+
+    await asyncio.sleep(seconds)

dataframe_textual/data_frame_help_panel.py

@@ -79,10 +79,12 @@ class DataFrameHelpPanel(Widget):
             None
         """
 
-        def update_help(focused_widget: Widget | None):
-            self.update_help(focused_widget)
+        # def update_help(focused_widget: Widget | None):
+        #     self.update_help(focused_widget)
 
-        self.watch(self.screen, "focused", update_help)
+        # self.watch(self.screen, "focused", update_help)
+
+        self.update_help(self.screen.focused)
 
     def update_help(self, focused_widget: Widget | None) -> None:
         """Update the help for the focused widget.
@@ -96,7 +98,7 @@ class DataFrameHelpPanel(Widget):
             return
         self.set_class(focused_widget is not None, "-show-help")
         if focused_widget is not None:
-            help = self.app.HELP + "\n" + focused_widget.HELP or ""
+            help = (self.app.HELP or "") + "\n" + (focused_widget.HELP or "")
             if not help:
                 self.remove_class("-show-help")
             try: