dcicutils 8.8.3.1b22__tar.gz → 8.8.3.1b26__tar.gz

{dcicutils-8.8.3.1b22 → dcicutils-8.8.3.1b26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.3.1b22
+Version: 8.8.3.1b26
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.8.3.1b22 → dcicutils-8.8.3.1b26}/dcicutils/progress_bar.py

@@ -279,10 +279,10 @@ class ProgressBar:
         # string in the display string where the progress bar should actually go,
         # which we do in _format_description. Other minor things too; see below.
         sys_stdout_write = sys.stdout.write
-        last_text = None ; last_captured_output_text = None  # noqa
+        last_text = None ; last_captured_output_text = None ; last_spin_change_time = None  # noqa
         def tidy_stdout_write(text: str) -> None:  # noqa
             nonlocal self, sys_stdout_write, sentinel_internal, spina, spini, spinn
-            nonlocal last_text, last_captured_output_text
+            nonlocal last_text, last_captured_output_text, last_spin_change_time
             def replace_first(value: str, match: str, replacement: str) -> str:  # noqa
                 return value[:i] + replacement + value[i + len(match):] if (i := value.find(match)) >= 0 else value
             def remove_extra_trailing_spaces(text: str) -> str:  # noqa
@@ -292,22 +292,25 @@ class ProgressBar:
             if (not text) or (last_text == text):
                 return
             last_text = text
+            now = time.time()
             if (self._disabled or self._done) and sentinel_internal in text:
                 # Another hack to really disable output on interrupt; in this case we set
                 # tqdm.disable to True, but output can still dribble out, so if the output
                 # looks like it is from tqdm and we are disabled/done then do no output.
                 return
             if sentinel_internal in text:
-                spinc = spina[spini % spinn] if not ("100%|" in text) else "✓" ; spini += 1  # noqa
+                spinc = spina[spini % spinn] if not ("100%|" in text) else "✓"
+                if last_spin_change_time is None or ((now - last_spin_change_time) >= 0.07):
+                    spini += 1
+                    last_spin_change_time = now
                 text = replace_first(text, sentinel_internal, f" {spinc}")
                 text = replace_first(text, "%|", "% ◀|")
-                text = remove_extra_trailing_spaces(text) + f"{spinc} "
                 # Another oddity: for the rate sometimes tqdm intermittently prints
                 # something like "1.54s/" rather than "1.54/s"; something to do with
                 # the unit we gave, which is empty; idunno; just replace it here.
                 text = replace_first(text, "s/ ", "/s ")
             if self._use_byte_size_for_rate and self._bar:
-                rate = self._bar.n / (time.time() - self._started)
+                rate = self._bar.n / (now - self._started)
                 text = text.replace("[rate]", f"{format_size(rate)}/s")
             sys_stdout_write(text)
             sys.stdout.flush()
@@ -320,9 +323,6 @@ class ProgressBar:
                 # This function obviously has intimate knowledge of the output; better here than in tests.
                 def replace_time_dependent_values_with_static(text: str) -> str:
                     blocks = "\u2587|\u2588|\u2589|\u258a|\u258b|\u258c|\u258d|\u258e|\u258f"
-                    if text.endswith("| "):
-                        # In case "|" is in the trailing spinner it messes up regex below.
-                        text = set_nth(text, len(text) - 2, "-")
                     if (n := find_nth_from_end(text, "|", 5)) >= 8:
                         pattern = re.compile(
                             rf"(\s*)(\d*%? ◀\|)(?:\s*{blocks}|#)*\s*(\|\s*\d+/\d+)?(\s*\|\s*)"
@@ -345,10 +345,25 @@ class ProgressBar:
             # Fun with ASCII spinner characters.
             # Dots borrowed from "rich" python package (others: ⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏).
             # Others: "◴◷◶◵" "◰◳◲◱" "◡⊙◠" "⠁⠂⠄⡀⢀⠠⠐⠈" "▁▃▄▅▆▇█▇▆▅▄▃" "◢◣◤◥" "◐◓◑◒" "✶✸✹✺✹✷" "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏"
-            spinner_chars_a = "⣾⣽⣻⢿⡿⣟⣯⣷"
-            spinner_chars_b = "|/-\\"
-            spinner_chars_c = "◰◳◲◱"
-            return (list(spinner_chars_a[::-1]) * 9) + (list(spinner_chars_b) * 3) + (list(spinner_chars_c) * 3)
+            spinner_chars_a = "⣾⣽⣻⢿⡿⣟⣯⣷"[::-1]
+            spinner_chars_b = "⠋⠙⠹⠸⢰⣰⣠⣄⣆⡆⡖⠖⠚⠙⠋⠏⠇⡆⣆⣄⣠⣰⢰⢲⠲"
+            spinner_chars_c = "⠉⠒⠤⣀⠤⠒"
+            spinner_chars_d = "⡀⡄⡆⠇⠋⠙⠸⢰⢠⢀⢠⢰⠸⠙⠋⠇⡆⡄"
+            spinner_chars_e = "⠀⡀⠄⠂⠁⠈⠐⠠⢀⣀⢄⢂⢁⢈⢐⢠⣠⢤⢢⢡⢨⢰⣰⢴⢲⢱⢸⣸⢼⢺⢹⣹⢽⢻⣻⢿⣿⣶⣤⣀"
+            spinner_chars_f = "⣀⣤⣶⣿⣶⣤"
+            spinner_chars_g = "⠋⠙⠹⠸⢰⣰⣠⣄⣆⡆⠇⠏"
+            spinner_chars_h = "⠁⠉⠙⠚⠒⠂⠂⠒⠲⠴⠤⠄⠄⠤⢤⣠⣀⢀⢀⣀⣠⢤⠤⠄⠄⠤⠴⠲⠒⠂⠂⠒⠚⠙⠉⠁"
+            spinner_chars_i = "◐◓◑◒"
+            spinner_chars_j = "|/—*—\\"
+            return ((list(spinner_chars_a) * 8) + (list(spinner_chars_b) * 2) +
+                    (list(spinner_chars_a) * 8) + (list(spinner_chars_c) * 4) +
+                    (list(spinner_chars_a) * 8) + (list(spinner_chars_d) * 2) +
+                    (list(spinner_chars_a) * 8) + (list(spinner_chars_e) * 2) +
+                    (list(spinner_chars_a) * 8) + (list(spinner_chars_f) * 4) +
+                    (list(spinner_chars_a) * 8) + (list(spinner_chars_g) * 4) +
+                    (list(spinner_chars_a) * 8) + (list(spinner_chars_h) * 2) +
+                    (list(spinner_chars_a) * 8) + (list(spinner_chars_i) * 2) +
+                    (list(spinner_chars_a) * 8) + (list(spinner_chars_j) * 2))
         sys.stdout.write = tidy_stdout_write
         spina = ascii_spinners() ; spini = 0 ; spinn = len(spina)  # noqa
         sentinel = "[progress]" ; sentinel_internal = f"{sentinel}:"  # noqa

{dcicutils-8.8.3.1b22 → dcicutils-8.8.3.1b26}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.8.3.1b22"  # TODO: To become 8.8.4
+version = "8.8.3.1b26"  # TODO: To become 8.8.4
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"