Merge pull request #470 from ssl-hep/feat/progress_bar

Resolves the progress bar final count not updating

Author: ketan96-m

servicex/query_core.py

@@ -381,6 +381,7 @@ async def transform_status_listener(
                 progress.update(
                     progress_task,
                     progress_bar_title,
+                    total=self.current_status.files,
                     completed=self.current_status.files_completed,
                 )
 
@@ -397,6 +398,7 @@ async def transform_status_listener(
                     progress.update(
                         progress_task,
                         progress_bar_title,
+                        self.current_status.files,
                         completed=self.current_status.files_completed,
                         bar=bar)
                     return

tests/test_expandable_progress.py

@@ -134,3 +134,29 @@ def test_get_renderables_with_failure():
     assert len(progress.columns) == 4
     assert isinstance(progress.columns[1], BarColumn)
     assert progress.columns[1].complete_style == 'rgb(255,0,0)'
+
+
+def test_progress_advance():
+    with ExpandableProgress() as progress:
+        t_id = progress.add_task("Transformation", True, 100)
+        d_id = progress.add_task("Download", True, 100)
+        completed = 12
+        total = 100
+        progress.update(t_id, "Transform", total, completed)
+        progress.advance(t_id, "Transform")
+        assert progress.progress.tasks[0].completed - 1 == completed
+
+    with ExpandableProgress(overall_progress=True) as progress:
+        t_id = progress.add_task("Transform", True, 100)
+        completed = 12
+        total = 100
+        progress.update(t_id, "Transform", total, completed)
+        progress.advance(t_id, "Transform")
+        assert progress.progress.tasks[0].completed - 1 == completed
+
+        d_id = progress.add_task("Download", True, 100)
+        completed = 12
+        total = 100
+        progress.update(d_id, "Transform", total, completed)
+        progress.advance(d_id, "Transform")
+        assert progress.progress.tasks[0].completed - 1 == completed