mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-06-28 02:53:30 +00:00
style: remove prints in codebase (#1146)
# What does this PR do? - replace prints in codebase with logger - update print_table to use rich Table ## Test Plan - library client script in https://github.com/meta-llama/llama-stack/pull/1145 ``` llama stack list-providers ``` <img width="1407" alt="image" src="https://github.com/user-attachments/assets/906b4f54-9e42-4e55-8968-7e3aa45525b2" /> [//]: # (## Documentation)
This commit is contained in:
parent
e8cb9e0adb
commit
37cf60b732
4 changed files with 38 additions and 65 deletions
|
@ -4,75 +4,36 @@
|
|||
# This source code is licensed under the terms described in the LICENSE file in
|
||||
# the root directory of this source tree.
|
||||
|
||||
import re
|
||||
import textwrap
|
||||
from typing import Iterable
|
||||
|
||||
from termcolor import cprint
|
||||
|
||||
|
||||
def strip_ansi_colors(text):
|
||||
ansi_escape = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
|
||||
return ansi_escape.sub("", text)
|
||||
|
||||
|
||||
def format_row(row, col_widths):
|
||||
def wrap(text, width):
|
||||
lines = []
|
||||
for line in text.split("\n"):
|
||||
if line.strip() == "":
|
||||
lines.append("")
|
||||
else:
|
||||
lines.extend(textwrap.wrap(line, width, break_long_words=False, replace_whitespace=False))
|
||||
return lines
|
||||
|
||||
wrapped = [wrap(item, width) for item, width in zip(row, col_widths, strict=False)]
|
||||
max_lines = max(len(subrow) for subrow in wrapped)
|
||||
|
||||
lines = []
|
||||
for i in range(max_lines):
|
||||
line = []
|
||||
for cell_lines, width in zip(wrapped, col_widths, strict=False):
|
||||
value = cell_lines[i] if i < len(cell_lines) else ""
|
||||
line.append(value + " " * (width - len(strip_ansi_colors(value))))
|
||||
lines.append("| " + (" | ".join(line)) + " |")
|
||||
|
||||
return "\n".join(lines)
|
||||
from rich.console import Console
|
||||
from rich.table import Table
|
||||
|
||||
|
||||
def print_table(rows, headers=None, separate_rows: bool = False, sort_by: Iterable[int] = tuple()):
|
||||
def itemlen(item):
|
||||
return max([len(line) for line in strip_ansi_colors(item).split("\n")])
|
||||
|
||||
# Convert rows and handle None values
|
||||
rows = [[x or "" for x in row] for row in rows]
|
||||
|
||||
# Sort rows if sort_by is specified
|
||||
if sort_by:
|
||||
rows.sort(key=lambda x: tuple(x[i] for i in sort_by))
|
||||
|
||||
if not headers:
|
||||
col_widths = [max(itemlen(item) for item in col) for col in zip(*rows, strict=False)]
|
||||
else:
|
||||
col_widths = [
|
||||
max(
|
||||
itemlen(header),
|
||||
max(itemlen(item) for item in col),
|
||||
)
|
||||
for header, col in zip(headers, zip(*rows, strict=False), strict=False)
|
||||
]
|
||||
col_widths = [min(w, 80) for w in col_widths]
|
||||
|
||||
header_line = "+".join("-" * (width + 2) for width in col_widths)
|
||||
header_line = f"+{header_line}+"
|
||||
# Create Rich table
|
||||
table = Table(show_lines=separate_rows)
|
||||
|
||||
# Add headers if provided
|
||||
if headers:
|
||||
print(header_line)
|
||||
cprint(format_row(headers, col_widths), "white", attrs=["bold"])
|
||||
for header in headers:
|
||||
table.add_column(header, style="bold white")
|
||||
else:
|
||||
# Add unnamed columns based on first row
|
||||
for _ in range(len(rows[0]) if rows else 0):
|
||||
table.add_column()
|
||||
|
||||
print(header_line)
|
||||
# Add rows
|
||||
for row in rows:
|
||||
print(format_row(row, col_widths))
|
||||
if separate_rows:
|
||||
print(header_line)
|
||||
table.add_row(*row)
|
||||
|
||||
if not separate_rows:
|
||||
print(header_line)
|
||||
# Print table
|
||||
console = Console()
|
||||
console.print(table)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue