Skip to content

cli: don't show excess whitespace #171

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
sondove merged 1 commit into from
Jan 29, 2026
Merged

cli: don't show excess whitespace #171

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
117 changes: 81 additions & 36 deletions novem/cli/vis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,21 +116,36 @@ def summary_fmt(summary: Optional[str], cl: cl) -> str:

return summary.replace("\n", "")

has_favs = any("*" in p.get("fav", "") for p in plist)
has_likes = any("+" in p.get("fav", "") for p in plist)

def fav_fmt(markers: str, cl: cl) -> str:
fav_str = f"{cl.WARNING}*{cl.ENDFGC}" if "*" in markers else " "
like_str = f"{cl.OKBLUE}+{cl.ENDFGC}" if "+" in markers else " "
return f" {fav_str}{like_str} "
parts = ""
if has_favs:
parts += f"{cl.WARNING}*{cl.ENDFGC}" if "*" in markers else " "
if has_likes:
parts += f"{cl.OKBLUE}+{cl.ENDFGC}" if "+" in markers else " "
return f" {parts} " if parts else ""

fav_header_width = (1 if has_favs else 0) + (1 if has_likes else 0)
fav_header = (" " * (fav_header_width + 2)) if fav_header_width > 0 else ""

ppo: List[Dict[str, Any]] = [
{
"key": "fav",
"header": " ",
"type": "text",
"fmt": fav_fmt,
"overflow": "keep",
"no_border": True,
"no_padding": True,
},
*(
[
{
"key": "fav",
"header": fav_header,
"type": "text",
"fmt": fav_fmt,
"overflow": "keep",
"no_border": True,
"no_padding": True,
},
]
if has_favs or has_likes
else []
),
{
"key": "id",
"header": f"{type} ID",
Expand Down Expand Up @@ -744,21 +759,36 @@ def status_fmt(status: Optional[str], cl: cl) -> str:
return f"{cl.WARNING}{status}{cl.ENDFGC}"
return status

has_favs = any("*" in p.get("fav", "") for p in plist)
has_likes = any("+" in p.get("fav", "") for p in plist)

def fav_fmt(markers: str, cl: cl) -> str:
fav_str = f"{cl.WARNING}*{cl.ENDFGC}" if "*" in markers else " "
like_str = f"{cl.OKBLUE}+{cl.ENDFGC}" if "+" in markers else " "
return f" {fav_str}{like_str} "
parts = ""
if has_favs:
parts += f"{cl.WARNING}*{cl.ENDFGC}" if "*" in markers else " "
if has_likes:
parts += f"{cl.OKBLUE}+{cl.ENDFGC}" if "+" in markers else " "
return f" {parts} " if parts else ""

fav_header_width = (1 if has_favs else 0) + (1 if has_likes else 0)
fav_header = (" " * (fav_header_width + 2)) if fav_header_width > 0 else ""

ppo: List[Dict[str, Any]] = [
{
"key": "fav",
"header": " ",
"type": "text",
"fmt": fav_fmt,
"overflow": "keep",
"no_border": True,
"no_padding": True,
},
*(
[
{
"key": "fav",
"header": fav_header,
"type": "text",
"fmt": fav_fmt,
"overflow": "keep",
"no_border": True,
"no_padding": True,
},
]
if has_favs or has_likes
else []
),
{
"key": "id",
"header": "Job ID",
Expand Down Expand Up @@ -1531,21 +1561,36 @@ def summary_fmt(summary: Optional[str], _cl: Any) -> str:
return ""
return summary.replace("\n", "")

has_favs = any("*" in p.get("fav", "") for p in plist)
has_likes = any("+" in p.get("fav", "") for p in plist)

def fav_fmt(markers: str, _cl: Any) -> str:
fav_str = f"{cl.WARNING}*{cl.ENDFGC}" if "*" in markers else " "
like_str = f"{cl.OKBLUE}+{cl.ENDFGC}" if "+" in markers else " "
return f" {fav_str}{like_str} "
parts = ""
if has_favs:
parts += f"{cl.WARNING}*{cl.ENDFGC}" if "*" in markers else " "
if has_likes:
parts += f"{cl.OKBLUE}+{cl.ENDFGC}" if "+" in markers else " "
return f" {parts} " if parts else ""

fav_header_width = (1 if has_favs else 0) + (1 if has_likes else 0)
fav_header = (" " * (fav_header_width + 2)) if fav_header_width > 0 else ""

ppo: List[Dict[str, Any]] = [
{
"key": "fav",
"header": " ",
"type": "text",
"fmt": fav_fmt,
"overflow": "keep",
"no_border": True,
"no_padding": True,
},
*(
[
{
"key": "fav",
"header": fav_header,
"type": "text",
"fmt": fav_fmt,
"overflow": "keep",
"no_border": True,
"no_padding": True,
},
]
if has_favs or has_likes
else []
),
{
"key": "username",
"header": "Username",
Expand Down
5 changes: 2 additions & 3 deletions tests/test_cli_grids.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,14 +283,13 @@ def summary_fmt(summary, cl):

def fav_fmt(markers, cl):
fav_str = f"{cl.WARNING}*{cl.ENDC}" if "*" in markers else " "
like_str = f"{cl.OKBLUE}+{cl.ENDC}" if "+" in markers else " "
return f" {fav_str}{like_str} "
return f" {fav_str} "

# construct our pretty print list
ppo = [
{
"key": "fav",
"header": " ",
"header": " ",
"type": "text",
"fmt": fav_fmt,
"overflow": "keep",
Expand Down
5 changes: 2 additions & 3 deletions tests/test_cli_plots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,14 +285,13 @@ def summary_fmt(summary, cl):

def fav_fmt(markers, cl):
fav_str = f"{cl.WARNING}*{cl.ENDC}" if "*" in markers else " "
like_str = f"{cl.OKBLUE}+{cl.ENDC}" if "+" in markers else " "
return f" {fav_str}{like_str} "
return f" {fav_str} "

# construct our pretty print list
ppo = [
{
"key": "fav",
"header": " ",
"header": " ",
"type": "text",
"fmt": fav_fmt,
"overflow": "keep",
Expand Down