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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
dcicutils/progress_bar.py CHANGED
@@ -133,7 +133,7 @@ class ProgressBar:
133
133
  if not _norefresh:
134
134
  self._bar.refresh()
135
135
 
136
- def increment_progress(self, value: int) -> None:
136
+ def increment_progress(self, value: int = 1) -> None:
137
137
  if isinstance(value, int) and value > 0:
138
138
  if (self._bar is not None) or self._initialize():
139
139
  self._bar.update(value)
@@ -300,12 +300,11 @@ class ProgressBar:
300
300
  return
301
301
  if sentinel_internal in text:
302
302
  spinc = spina[spini % spinn] if not ("100%|" in text) else "✓"
303
- if last_spin_change_time is None or ((now - last_spin_change_time) >= 0.05):
303
+ if last_spin_change_time is None or ((now - last_spin_change_time) >= 0.06):
304
304
  spini += 1
305
305
  last_spin_change_time = now
306
306
  text = replace_first(text, sentinel_internal, f" {spinc}")
307
307
  text = replace_first(text, "%|", "% ◀|")
308
- text = remove_extra_trailing_spaces(text) + f"{spinc} "
309
308
  # Another oddity: for the rate sometimes tqdm intermittently prints
310
309
  # something like "1.54s/" rather than "1.54/s"; something to do with
311
310
  # the unit we gave, which is empty; idunno; just replace it here.
@@ -324,9 +323,6 @@ class ProgressBar:
324
323
  # This function obviously has intimate knowledge of the output; better here than in tests.
325
324
  def replace_time_dependent_values_with_static(text: str) -> str:
326
325
  blocks = "\u2587|\u2588|\u2589|\u258a|\u258b|\u258c|\u258d|\u258e|\u258f"
327
- if text.endswith("| "):
328
- # In case "|" is in the trailing spinner it messes up regex below.
329
- text = set_nth(text, len(text) - 2, "-")
330
326
  if (n := find_nth_from_end(text, "|", 5)) >= 8:
331
327
  pattern = re.compile(
332
328
  rf"(\s*)(\d*%? ◀\|)(?:\s*{blocks}|#)*\s*(\|\s*\d+/\d+)?(\s*\|\s*)"
@@ -349,14 +345,25 @@ class ProgressBar:
349
345
  # Fun with ASCII spinner characters.
350
346
  # Dots borrowed from "rich" python package (others: ⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏).
351
347
  # Others: "◴◷◶◵" "◰◳◲◱" "◡⊙◠" "⠁⠂⠄⡀⢀⠠⠐⠈" "▁▃▄▅▆▇█▇▆▅▄▃" "◢◣◤◥" "◐◓◑◒" "✶✸✹✺✹✷" "⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏"
352
- spinner_chars_a = "⣾⣽⣻⢿⡿⣟⣯⣷"
353
- spinner_chars_b = "|/—\\"
354
- spinner_chars_c = "◰◳◲◱"
355
- spinner_chars_d = "◐◓◑◒"
356
- spinner_chars_e = "◴◷◶◵"
357
- return ((list(spinner_chars_a[::-1]) * 18) +
358
- (list(spinner_chars_b) * 3) + (list(spinner_chars_c) * 3) +
359
- (list(spinner_chars_d) * 3) + (list(spinner_chars_e) * 3))
348
+ spinner_chars_a = list("⣾⣽⣻⢿⡿⣟⣯⣷"[::-1]) * 8
349
+ spinner_chars_b = list("⠋⠙⠹⠸⢰⣰⣠⣄⣆⡆⡖⠖⠚⠙⠋⠏⠇⡆⣆⣄⣠⣰⢰⢲⠲")
350
+ spinner_chars_c = list("⣀⣤⣶⣿⣶⣤")
351
+ spinner_chars_d = list("⡀⡄⡆⠇⠋⠙⠸⢰⢠⢀⢠⢰⠸⠙⠋⠇⡆⡄")
352
+ spinner_chars_e = list("⠀⡀⠄⠂⠁⠈⠐⠠⢀⣀⢄⢂⢁⢈⢐⢠⣠⢤⢢⢡⢨⢰⣰⢴⢲⢱⢸⣸⢼⢺⢹⣹⢽⢻⣻⢿⣿⣶⣤⣀")
353
+ spinner_chars_f = list("⠉⠒⠤⣀⠤⠒")
354
+ spinner_chars_g = list("⠋⠙⠹⠸⢰⣰⣠⣄⣆⡆⠇⠏")
355
+ spinner_chars_h = list("⠁⠉⠙⠚⠒⠂⠂⠒⠲⠴⠤⠄⠄⠤⢤⣠⣀⢀⢀⣀⣠⢤⠤⠄⠄⠤⠴⠲⠒⠂⠂⠒⠚⠙⠉⠁")
356
+ spinner_chars_i = list("◐◓◑◒")
357
+ spinner_chars_j = list("|/—*—\\")
358
+ return (spinner_chars_a + (spinner_chars_b * 2) +
359
+ spinner_chars_a + (spinner_chars_c * 4) +
360
+ spinner_chars_a + (spinner_chars_d * 2) +
361
+ spinner_chars_a + (spinner_chars_e * 2) +
362
+ spinner_chars_a + (spinner_chars_f * 4) +
363
+ spinner_chars_a + (spinner_chars_g * 5) +
364
+ spinner_chars_a + (spinner_chars_h * 2) +
365
+ spinner_chars_a + (spinner_chars_i * 5) +
366
+ spinner_chars_a + (spinner_chars_j * 4))
360
367
  sys.stdout.write = tidy_stdout_write
361
368
  spina = ascii_spinners() ; spini = 0 ; spinn = len(spina) # noqa
362
369
  sentinel = "[progress]" ; sentinel_internal = f"{sentinel}:" # noqa
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: dcicutils
3
- Version: 8.8.3.1b24
3
+ Version: 8.8.3.1b27
4
4
  Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
5
5
  Home-page: https://github.com/4dn-dcic/utils
6
6
  License: MIT
@@ -48,7 +48,7 @@ dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmj
48
48
  dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
49
49
  dcicutils/portal_object_utils.py,sha256=gDXRgPsRvqCFwbC8WatsuflAxNiigOnqr0Hi93k3AgE,15422
50
50
  dcicutils/portal_utils.py,sha256=DYyE5o15GekDgzpJWas9iS7klAYbjJZUPW0G42McArk,30779
51
- dcicutils/progress_bar.py,sha256=7cqnBB7ZzY0cHIgWvNwreYUYAosXwf3zxvvYRD9N-4Q,18751
51
+ dcicutils/progress_bar.py,sha256=UT7lxb-rVF_gp4yjY2Tg4eun1naaH__hB4_v3O85bcE,19468
52
52
  dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
53
53
  dcicutils/qa_checkers.py,sha256=cdXjeL0jCDFDLT8VR8Px78aS10hwNISOO5G_Zv2TZ6M,20534
54
54
  dcicutils/qa_utils.py,sha256=TT0SiJWiuxYvbsIyhK9VO4uV_suxhB6CpuC4qPacCzQ,160208
@@ -72,8 +72,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
72
72
  dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
73
73
  dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
74
74
  dcicutils/zip_utils.py,sha256=rnjNv_k6L9jT2SjDSgVXp4BEJYLtz9XN6Cl2Fy-tqnM,2027
75
- dcicutils-8.8.3.1b24.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
76
- dcicutils-8.8.3.1b24.dist-info/METADATA,sha256=6NnLtyDOFz9tsB4OVMHkHyNObT4uZIYB2zKq-QXjerg,3357
77
- dcicutils-8.8.3.1b24.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
78
- dcicutils-8.8.3.1b24.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
79
- dcicutils-8.8.3.1b24.dist-info/RECORD,,
75
+ dcicutils-8.8.3.1b27.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
76
+ dcicutils-8.8.3.1b27.dist-info/METADATA,sha256=EuI8_HpKzkZarl-iO6O_Yy6wSzhfjkayntkMWU8RxRY,3357
77
+ dcicutils-8.8.3.1b27.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
78
+ dcicutils-8.8.3.1b27.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
79
+ dcicutils-8.8.3.1b27.dist-info/RECORD,,