dcicutils 8.8.1.1b12__py3-none-any.whl → 8.8.1.1b15__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.
@@ -1,3 +1,4 @@
1
+ from datetime import datetime
1
2
  from enum import Enum
2
3
 
3
4
 
@@ -16,6 +17,7 @@ class PROGRESS_INGESTER(Enum):
16
17
  MESSAGE = "ingester_message"
17
18
  MESSAGE_VERBOSE = "ingester_message_verbose"
18
19
  MESSAGE_DEBUG = "ingester_message_debug"
20
+ NOW = lambda: str(datetime.utcnow()) # noqa
19
21
 
20
22
 
21
23
  class PROGRESS_PARSE(Enum):
@@ -41,6 +43,7 @@ class PROGRESS_PARSE(Enum):
41
43
  MESSAGE = "parse_message"
42
44
  MESSAGE_VERBOSE = "parse_message_verbose"
43
45
  MESSAGE_DEBUG = "parse_message_debug"
46
+ NOW = lambda: str(datetime.utcnow()) # noqa
44
47
 
45
48
 
46
49
  class PROGRESS_LOADXL(Enum):
@@ -57,3 +60,4 @@ class PROGRESS_LOADXL(Enum):
57
60
  MESSAGE = "loadxl_message"
58
61
  MESSAGE_VERBOSE = "loadxl_message_verbose"
59
62
  MESSAGE_DEBUG = "loadxl_message_debug"
63
+ NOW = lambda: str(datetime.utcnow()) # noqa
@@ -192,7 +192,7 @@ class StructuredDataSet:
192
192
  diffs = {}
193
193
  if callable(progress):
194
194
  ntypes, nobjects = get_counts()
195
- progress({PROGRESS.ANALYZE_START.value: True,
195
+ progress({PROGRESS.ANALYZE_START.value: PROGRESS.NOW(),
196
196
  PROGRESS.ANALYZE_COUNT_TYPES.value: ntypes, PROGRESS.ANALYZE_COUNT_ITEMS.value: nobjects})
197
197
  if self.data or self.portal: # TODO: what is this OR biz?
198
198
  refs = self.resolved_refs_with_uuids
@@ -225,7 +225,7 @@ class StructuredDataSet:
225
225
  if callable(progress):
226
226
  progress({PROGRESS.ANALYZE_COUNT_LOOKUP.value: nlookups})
227
227
  if callable(progress):
228
- progress({PROGRESS.ANALYZE_DONE.value: True})
228
+ progress({PROGRESS.ANALYZE_DONE.value: PROGRESS.NOW()})
229
229
  return diffs
230
230
 
231
231
  def load_file(self, file: str) -> None:
@@ -272,7 +272,7 @@ class StructuredDataSet:
272
272
  return nrows, len(excel.sheet_names)
273
273
  if self._progress: # TODO: Move to _load_reader
274
274
  nrows, nsheets = get_counts()
275
- self._progress({PROGRESS.LOAD_START.value: True,
275
+ self._progress({PROGRESS.LOAD_START.value: PROGRESS.NOW(),
276
276
  PROGRESS.LOAD_COUNT_SHEETS.value: nsheets, PROGRESS.LOAD_COUNT_ROWS.value: nrows})
277
277
  excel = Excel(file) # Order the sheet names by any specified ordering (e.g. ala snovault.loadxl).
278
278
  order = {Schema.type_name(key): index for index, key in enumerate(self._order)} if self._order else {}
@@ -298,7 +298,7 @@ class StructuredDataSet:
298
298
  del self._errors["ref"]
299
299
  if self._progress:
300
300
  self._progress({ # TODO: Refactor with same thing below in _load_reader.
301
- PROGRESS.LOAD_DONE.value: True,
301
+ PROGRESS.LOAD_DONE.value: PROGRESS.NOW(),
302
302
  PROGRESS.LOAD_COUNT_REFS.value: self.ref_total_count,
303
303
  PROGRESS.LOAD_COUNT_REFS_FOUND.value: self.ref_total_found_count,
304
304
  PROGRESS.LOAD_COUNT_REFS_NOT_FOUND.value: self.ref_total_notfound_count,
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: dcicutils
3
- Version: 8.8.1.1b12
3
+ Version: 8.8.1.1b15
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=MF6MTZ6yxakZFDjbkTKCsF4q4p11dLDVvT5JBV9m6RQ,15408
50
50
  dcicutils/portal_utils.py,sha256=oBoI3KWRp6YrbsuVGbmPQ3kATB5cVVsQo7-qmnYXWqg,30260
51
- dcicutils/progress_constants.py,sha256=oD6JKkPWDM22sFDlEus-JlDl9-jUC82MezVV8nJq870,2146
51
+ dcicutils/progress_constants.py,sha256=9fCppbB8vKgXBUlmzuaz7z6ylv4GmONrGw9-iwIhRu8,2323
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
@@ -63,15 +63,15 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
63
63
  dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
64
64
  dcicutils/snapshot_utils.py,sha256=ymP7PXH6-yEiXAt75w0ldQFciGNqWBClNxC5gfX2FnY,22961
65
65
  dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
66
- dcicutils/structured_data.py,sha256=uJA-uU1SsPHQTDYm4hwV2d49HwjZvppYKsHcTyKxGPE,58765
66
+ dcicutils/structured_data.py,sha256=S476gIC89TsUj3NxiE7FG1JlO-_tuV9wTYq4Nl0CIf8,58805
67
67
  dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
68
68
  dcicutils/tmpfile_utils.py,sha256=n95XF8dZVbQRSXBZTGToXXfSs3JUVRyN6c3ZZ0nhAWI,1403
69
69
  dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
70
70
  dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
71
71
  dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
72
72
  dcicutils/zip_utils.py,sha256=rnjNv_k6L9jT2SjDSgVXp4BEJYLtz9XN6Cl2Fy-tqnM,2027
73
- dcicutils-8.8.1.1b12.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
74
- dcicutils-8.8.1.1b12.dist-info/METADATA,sha256=8CSebRTKE4rRjLBB7zCcZ-ISjDa7OElpjrC61nr2Dhg,3357
75
- dcicutils-8.8.1.1b12.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
76
- dcicutils-8.8.1.1b12.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
77
- dcicutils-8.8.1.1b12.dist-info/RECORD,,
73
+ dcicutils-8.8.1.1b15.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
74
+ dcicutils-8.8.1.1b15.dist-info/METADATA,sha256=r0UkHIY-aKRYZa2ezsteHzZpBX41-81PxWcLoMt7jXo,3357
75
+ dcicutils-8.8.1.1b15.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
76
+ dcicutils-8.8.1.1b15.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
77
+ dcicutils-8.8.1.1b15.dist-info/RECORD,,