Skip to content

Right align numeric columns #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
john-b-rush merged 1 commit into from
Jun 7, 2025
Merged

Right align numeric columns #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions chuck_data/command_output.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,11 @@ def format_date(row, col_name):
"updated": format_date,
}

# Set up column alignments for numerical columns
column_alignments = {
"# Cols": "right",
}

# Display the tables
display_table(
console=console,
Expand All @@ -295,6 +300,7 @@ def format_date(row, col_name):
headers=["Table Name", "Type", "# Cols", "Created", "Last Updated"],
title=f"Tables in {catalog_name}.{schema_name} ({total_count} total)",
style_map=style_map,
column_alignments=column_alignments,
title_style=TABLE_TITLE_STYLE,
show_lines=True,
)
Expand Down Expand Up @@ -392,6 +398,11 @@ def style_state(row):
"state": style_state,
}

# Set up column alignments for numerical columns
column_alignments = {
"Auto Stop": "right",
}

# Display the warehouses
display_table(
console=console,
Expand All @@ -400,6 +411,7 @@ def style_state(row):
headers=["Warehouse Name", "Size", "State", "Auto Stop", "Created By"],
title="Available Warehouses",
style_map=style_map,
column_alignments=column_alignments,
title_style=TABLE_TITLE_STYLE,
show_lines=False,
)
Expand Down
47 changes: 36 additions & 11 deletions chuck_data/ui/table_formatter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
to ensure consistent display of tabular data throughout the application.
"""

from typing import Any, Dict, List, Union
from typing import Any, Dict, List, Union, Optional, cast

from rich.console import Console
from rich.table import Table
Expand All @@ -16,8 +16,8 @@


def create_table(
title: str = None,
headers: List[str] = None,
title: Optional[str] = None,
headers: Optional[List[str]] = None,
show_header: bool = True,
show_lines: bool = True,
box_style: str = "ROUNDED",
Expand All @@ -26,6 +26,7 @@ def create_table(
header_style: str = HEADER_STYLE,
border_style: str = TABLE_BORDER_STYLE,
expand: bool = False,
column_alignments: Optional[Dict[str, str]] = None,
) -> Table:
"""
Create a Rich Table with consistent styling.
Expand All @@ -42,6 +43,7 @@ def create_table(
border_style: Style for table borders
expand: Whether the table should expand to fill available width.
Defaults to False so the table width matches its content.
column_alignments: Optional dict mapping header names to alignment ("left", "center", "right")

Returns:
A configured Rich Table object
Expand All @@ -65,7 +67,17 @@ def create_table(
# Add headers if provided
if headers and show_header:
for header in headers:
table.add_column(header, style=header_style)
# Get alignment for this column (default to left if not specified)
alignment = "left"
if column_alignments and header in column_alignments:
requested_alignment = column_alignments[header]
# Validate alignment value
if requested_alignment in ["left", "center", "right", "full"]:
alignment = requested_alignment

table.add_column(
header, style=header_style, justify=cast(Any, alignment)
)

return table
except Exception as e:
Expand All @@ -89,7 +101,17 @@ def create_table(
# Add headers if provided
if headers and show_header:
for header in headers:
table.add_column(header, style=header_style)
# Get alignment for this column (default to left if not specified)
alignment = "left"
if column_alignments and header in column_alignments:
requested_alignment = column_alignments[header]
# Validate alignment value
if requested_alignment in ["left", "center", "right", "full"]:
alignment = requested_alignment

table.add_column(
header, style=header_style, justify=cast(Any, alignment)
)

return table

Expand Down Expand Up @@ -131,7 +153,7 @@ def format_cell(value: Any, style: Any = None, none_display: str = "N/A") -> Tex
def add_row_with_styles(
table: Table,
row_data: List[Any],
styles: List[str] = None,
styles: Optional[List[str]] = None,
) -> None:
"""
Add a row to a table with optional styling per cell.
Expand All @@ -147,7 +169,7 @@ def add_row_with_styles(

# Format each cell and add to table
formatted_cells = [
format_cell(data, style=style) for data, style in zip(row_data, styles)
format_cell(data, style=style) for data, style in zip(row_data, styles or [])
]

table.add_row(*formatted_cells)
Expand All @@ -157,7 +179,7 @@ def add_rows_from_data(
table: Table,
data: List[Dict[str, Any]],
columns: List[str],
style_map: Dict[str, Any] = None,
style_map: Optional[Dict[str, Any]] = None,
) -> None:
"""
Add multiple rows from a list of dictionaries.
Expand Down Expand Up @@ -216,9 +238,9 @@ def display_table(
console: Console,
data: List[Dict[str, Any]],
columns: List[str],
headers: List[str] = None,
title: str = None,
style_map: Dict[str, Any] = None,
headers: Optional[List[str]] = None,
title: Optional[str] = None,
style_map: Optional[Dict[str, Any]] = None,
title_style: str = TABLE_TITLE_STYLE,
header_style: str = HEADER_STYLE,
border_style: str = TABLE_BORDER_STYLE,
Expand All @@ -227,6 +249,7 @@ def display_table(
box_style: str = "ROUNDED",
padding: Union[int, tuple] = (0, 1),
expand: bool = False,
column_alignments: Optional[Dict[str, str]] = None,
) -> None:
"""
Create, populate and display a table in one operation.
Expand All @@ -252,6 +275,7 @@ def display_table(
padding: Cell padding as int or tuple
expand: Whether the table should expand to fill available width. Defaults
to False so the table width matches its content.
column_alignments: Optional dict mapping header names to alignment ("left", "center", "right")
"""
try:
# Use columns as headers if not provided
Expand All @@ -270,6 +294,7 @@ def display_table(
box_style=box_style,
padding=padding,
expand=expand,
column_alignments=column_alignments,
)

# Handle empty data case
Expand Down
7 changes: 7 additions & 0 deletions chuck_data/ui/tui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,12 @@ def table_type_style(type_val):
else "Available Tables"
)

# Set up column alignments for numerical columns
column_alignments = {
"# Cols": "right",
"Rows": "right",
}

# Display the table using our formatter
display_table(
console=self.console,
Expand All @@ -924,6 +930,7 @@ def table_type_style(type_val):
headers=["Table Name", "Type", "# Cols", "Rows", "Created", "Last Updated"],
title=title,
style_map=style_map,
column_alignments=column_alignments,
title_style=TABLE_TITLE_STYLE,
show_lines=True,
)
Expand Down