dcicutils 8.8.3.1b24__py3-none-any.whl → 8.8.3.1b27__py3-none-any.whl

dcicutils/progress_bar.py

@@ -133,7 +133,7 @@ class ProgressBar:
                 if not _norefresh:
                     self._bar.refresh()
 
-    def increment_progress(self, value: int) -> None:
+    def increment_progress(self, value: int = 1) -> None:
         if isinstance(value, int) and value > 0:
             if (self._bar is not None) or self._initialize():
                 self._bar.update(value)
@@ -300,12 +300,11 @@ class ProgressBar:
                 return
             if sentinel_internal in text:
                 spinc = spina[spini % spinn] if not ("100%|" in text) else "✓"
-                if last_spin_change_time is None or ((now - last_spin_change_time) >= 0.05):
+                if last_spin_change_time is None or ((now - last_spin_change_time) >= 0.06):
                     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.
@@ -324,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*)"
@@ -349,14 +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 = "◰◳◲◱"
-            spinner_chars_d = "◐◓◑◒"
-            spinner_chars_e = "◴◷◶◵"
-            return ((list(spinner_chars_a[::-1]) * 18) +
-                    (list(spinner_chars_b) * 3) + (list(spinner_chars_c) * 3) +
-                    (list(spinner_chars_d) * 3) + (list(spinner_chars_e) * 3))
+            spinner_chars_a = list("⣾⣽⣻⢿⡿⣟⣯⣷"[::-1]) * 8
+            spinner_chars_b = list("⠋⠙⠹⠸⢰⣰⣠⣄⣆⡆⡖⠖⠚⠙⠋⠏⠇⡆⣆⣄⣠⣰⢰⢲⠲")
+            spinner_chars_c = list("⣀⣤⣶⣿⣶⣤")
+            spinner_chars_d = list("⡀⡄⡆⠇⠋⠙⠸⢰⢠⢀⢠⢰⠸⠙⠋⠇⡆⡄")
+            spinner_chars_e = list("⠀⡀⠄⠂⠁⠈⠐⠠⢀⣀⢄⢂⢁⢈⢐⢠⣠⢤⢢⢡⢨⢰⣰⢴⢲⢱⢸⣸⢼⢺⢹⣹⢽⢻⣻⢿⣿⣶⣤⣀")
+            spinner_chars_f = list("⠉⠒⠤⣀⠤⠒")
+            spinner_chars_g = list("⠋⠙⠹⠸⢰⣰⣠⣄⣆⡆⠇⠏")
+            spinner_chars_h = list("⠁⠉⠙⠚⠒⠂⠂⠒⠲⠴⠤⠄⠄⠤⢤⣠⣀⢀⢀⣀⣠⢤⠤⠄⠄⠤⠴⠲⠒⠂⠂⠒⠚⠙⠉⠁")
+            spinner_chars_i = list("◐◓◑◒")
+            spinner_chars_j = list("|/—*—\\")
+            return (spinner_chars_a + (spinner_chars_b * 2) +
+                    spinner_chars_a + (spinner_chars_c * 4) +
+                    spinner_chars_a + (spinner_chars_d * 2) +
+                    spinner_chars_a + (spinner_chars_e * 2) +
+                    spinner_chars_a + (spinner_chars_f * 4) +
+                    spinner_chars_a + (spinner_chars_g * 5) +
+                    spinner_chars_a + (spinner_chars_h * 2) +
+                    spinner_chars_a + (spinner_chars_i * 5) +
+                    spinner_chars_a + (spinner_chars_j * 4))
         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.1b24.dist-info → dcicutils-8.8.3.1b27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.3.1b24
+Version: 8.8.3.1b27
 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.1b24.dist-info → dcicutils-8.8.3.1b27.dist-info}/RECORD

@@ -48,7 +48,7 @@ dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmj
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
 dcicutils/portal_object_utils.py,sha256=gDXRgPsRvqCFwbC8WatsuflAxNiigOnqr0Hi93k3AgE,15422
 dcicutils/portal_utils.py,sha256=DYyE5o15GekDgzpJWas9iS7klAYbjJZUPW0G42McArk,30779
-dcicutils/progress_bar.py,sha256=7cqnBB7ZzY0cHIgWvNwreYUYAosXwf3zxvvYRD9N-4Q,18751
+dcicutils/progress_bar.py,sha256=UT7lxb-rVF_gp4yjY2Tg4eun1naaH__hB4_v3O85bcE,19468
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=cdXjeL0jCDFDLT8VR8Px78aS10hwNISOO5G_Zv2TZ6M,20534
 dcicutils/qa_utils.py,sha256=TT0SiJWiuxYvbsIyhK9VO4uV_suxhB6CpuC4qPacCzQ,160208
@@ -72,8 +72,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=rnjNv_k6L9jT2SjDSgVXp4BEJYLtz9XN6Cl2Fy-tqnM,2027
-dcicutils-8.8.3.1b24.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.8.3.1b24.dist-info/METADATA,sha256=6NnLtyDOFz9tsB4OVMHkHyNObT4uZIYB2zKq-QXjerg,3357
-dcicutils-8.8.3.1b24.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.8.3.1b24.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
-dcicutils-8.8.3.1b24.dist-info/RECORD,,
+dcicutils-8.8.3.1b27.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.8.3.1b27.dist-info/METADATA,sha256=EuI8_HpKzkZarl-iO6O_Yy6wSzhfjkayntkMWU8RxRY,3357
+dcicutils-8.8.3.1b27.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.8.3.1b27.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.8.3.1b27.dist-info/RECORD,,