Skip to content

Fix for colors with multiple progress bars #459

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
merged 1 commit into from
Sep 18, 2024
Merged

Fix for colors with multiple progress bars #459

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
31 changes: 18 additions & 13 deletions servicex/expandable_progress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,20 @@
TimeRemainingColumn, TaskID


DEFAULT_STYLE = [TextColumn("[progress.description]{task.description}"),
BarColumn(complete_style="rgb(114,156,31)",
finished_style="rgb(0,255,0)"),
MofNCompleteColumn(),
TimeRemainingColumn(compact=True, elapsed_when_finished=True)
]

BROKEN_STYLE = [TextColumn("[progress.description]{task.description}"),
BarColumn(complete_style="rgb(255,0,0)"),
MofNCompleteColumn(),
TimeRemainingColumn(compact=True, elapsed_when_finished=True)
]


class ProgressCounts:
def __init__(self,
description: str,
Expand Down Expand Up @@ -74,13 +88,7 @@ def __init__(self,
self.progress_counts = {}
if display_progress:
if self.overall_progress or not provided_progress:
self.progress = TranformStatusProgress(
TextColumn("[progress.description]{task.description}"),
BarColumn(complete_style="rgb(114,156,31)",
finished_style="rgb(0,255,0)"),
MofNCompleteColumn(),
TimeRemainingColumn(compact=True, elapsed_when_finished=True)
)
self.progress = TranformStatusProgress(*DEFAULT_STYLE)

if provided_progress:
self.progress = provided_progress if isinstance(provided_progress, Progress) \
Expand Down Expand Up @@ -190,10 +198,7 @@ class TranformStatusProgress(Progress):
def get_renderables(self):
for task in self.tasks:
if task.fields.get("bar") == "failure":
self.columns = [
TextColumn("[progress.description]{task.description}"),
BarColumn(complete_style="rgb(255,0,0)"),
MofNCompleteColumn(),
TimeRemainingColumn(compact=True, elapsed_when_finished=True)
]
self.columns = BROKEN_STYLE
else:
self.columns = DEFAULT_STYLE
yield self.make_tasks_table([task])