diff --git a/packages/vaex-core/vaex/dataframe.py b/packages/vaex-core/vaex/dataframe.py index f61bf5dfcd..b6fc68a8d6 100644 --- a/packages/vaex-core/vaex/dataframe.py +++ b/packages/vaex-core/vaex/dataframe.py @@ -3120,14 +3120,14 @@ def evaluate_iterator(self, expression, s1=None, s2=None, out=None, selection=No if not prefetch: # this is the simple implementation for l1, l2, i1, i2 in self._unfiltered_chunk_slices(chunk_size): - yield l1, l2, self._evaluate_implementation(expression, i1=i1, i2=i2, out=out, selection=selection, filtered=filtered, array_type=array_type, parallel=parallel, raw=True) + yield l1, l2, self._evaluate_implementation(expression, i1=i1, i2=i2, out=out, selection=selection, filtered=filtered, array_type=array_type, parallel=parallel, raw=True, progress=progress) progressbar(l2/len(self)) # But this implementation is faster if the main thread work is single threaded else: with concurrent.futures.ThreadPoolExecutor(1) as executor: iter = self._unfiltered_chunk_slices(chunk_size) def f(i1, i2): - return self._evaluate_implementation(expression, i1=i1, i2=i2, out=out, selection=selection, filtered=filtered, array_type=array_type, parallel=parallel, raw=True) + return self._evaluate_implementation(expression, i1=i1, i2=i2, out=out, selection=selection, filtered=filtered, array_type=array_type, parallel=parallel, raw=True, progress=progress) try: previous_l1, previous_l2, previous_i1, previous_i2 = next(iter) except StopIteration: diff --git a/packages/vaex-core/vaex/progress.py b/packages/vaex-core/vaex/progress.py index f91fd60eda..18d0d5959c 100644 --- a/packages/vaex-core/vaex/progress.py +++ b/packages/vaex-core/vaex/progress.py @@ -183,7 +183,7 @@ def bar(type_name=None, title="processing", max_value=1): def tree(f=None, next=None, name=None, title=None): if f in [False, None] and _progress_tree_stack: - f = _progress_tree_stack[-1] + f = _progress_tree_stack[-1].hidden() if f in [False, None] and vaex.settings.main.progress.force: f = vaex.settings.main.progress.force if name is None: