dcicutils 8.8.1.1b20__py3-none-any.whl → 8.8.1.1b22__py3-none-any.whl

dcicutils/progress_constants.py

@@ -19,7 +19,9 @@ class PROGRESS_INGESTER(_Enum):
     VALIDATION = "ingester_validation"
     QUEUED = "ingester_queued"
     INITIATE = "ingester_initiate"
+    CLEANUP = "ingester_cleanup"
     DONE = "ingester_done"
+    OUTCOME = "ingester_outcome"
     PARSE_LOAD_INITIATE = "ingester_parse_initiate"
     PARSE_LOAD_DONE = "ingester_parse_done"
     VALIDATE_LOAD_INITIATE = "ingester_validate_initiate"
@@ -48,9 +50,9 @@ class PROGRESS_PARSE(_Enum):
     ANALYZE_START = "parse_analyze_start"
     ANALYZE_COUNT_TYPES = "parse_analyze_types"
     ANALYZE_COUNT_ITEMS = "parse_analyze_objects"
-    ANALYZE_COUNT_LOOKUP = "parse_analyze_lookups"
     ANALYZE_CREATE = "parse_analyze_create"
     ANALYZE_UPDATE = "parse_analyze_update"
+    ANALYZE_LOOKUPS = "parse_analyze_lookups"
     ANALYZE_DONE = "parse_analyze_done"
     MESSAGE = "parse_message"
     MESSAGE_VERBOSE = "parse_message_verbose"

dcicutils/structured_data.py

@@ -213,17 +213,17 @@ class StructuredDataSet:
                                                                        diffs=object_diffs or None))
                         if callable(progress):
                             progress({PROGRESS.ANALYZE_UPDATE: True,
-                                      PROGRESS.ANALYZE_COUNT_LOOKUP: nlookups + nlookups_compare})
+                                      PROGRESS.ANALYZE_LOOKUPS: nlookups + nlookups_compare})
                     elif identifying_path:
                         # If there is no existing object we still create a record for this object
                         # but with no uuid which will be the indication that it does not exist.
                         diffs[type_name].append(create_readonly_object(path=identifying_path, uuid=None, diffs=None))
                         if callable(progress):
                             progress({PROGRESS.ANALYZE_CREATE: True,
-                                      PROGRESS.ANALYZE_COUNT_LOOKUP: nlookups})
+                                      PROGRESS.ANALYZE_LOOKUPS: nlookups})
                     else:
                         if callable(progress):
-                            progress({PROGRESS.ANALYZE_COUNT_LOOKUP: nlookups})
+                            progress({PROGRESS.ANALYZE_LOOKUPS: nlookups})
         if callable(progress):
             progress({PROGRESS.ANALYZE_DONE: PROGRESS.NOW()})
         return diffs

{dcicutils-8.8.1.1b20.dist-info → dcicutils-8.8.1.1b22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.8.1.1b20
+Version: 8.8.1.1b22
 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.1.1b20.dist-info → dcicutils-8.8.1.1b22.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=MF6MTZ6yxakZFDjbkTKCsF4q4p11dLDVvT5JBV9m6RQ,15408
 dcicutils/portal_utils.py,sha256=oBoI3KWRp6YrbsuVGbmPQ3kATB5cVVsQo7-qmnYXWqg,30260
-dcicutils/progress_constants.py,sha256=0-UwyKE374R26e58sYby_BbbIsVUZGJk4TaPBMwHlGo,2789
+dcicutils/progress_constants.py,sha256=iREUcszkufU3yHy13mbUY2wo_vr9CN9ac_ut65oYajk,2850
 dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
 dcicutils/qa_checkers.py,sha256=cdXjeL0jCDFDLT8VR8Px78aS10hwNISOO5G_Zv2TZ6M,20534
 dcicutils/qa_utils.py,sha256=TT0SiJWiuxYvbsIyhK9VO4uV_suxhB6CpuC4qPacCzQ,160208
@@ -63,15 +63,15 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=ymP7PXH6-yEiXAt75w0ldQFciGNqWBClNxC5gfX2FnY,22961
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
-dcicutils/structured_data.py,sha256=_AFFDColRikKygOTD5uk1SBj8tvv5dOr5UqicKxFZJo,58637
+dcicutils/structured_data.py,sha256=qWJ6nEqDyzhXadbNHfpf2A6eLnv4aMxU9F90k3JrPsg,58622
 dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
 dcicutils/tmpfile_utils.py,sha256=n95XF8dZVbQRSXBZTGToXXfSs3JUVRyN6c3ZZ0nhAWI,1403
 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.1.1b20.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.8.1.1b20.dist-info/METADATA,sha256=L6_KbnQOS2cA7Rf9seDKza9Nmjb5niBCXCyjv6ehfPs,3357
-dcicutils-8.8.1.1b20.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.8.1.1b20.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
-dcicutils-8.8.1.1b20.dist-info/RECORD,,
+dcicutils-8.8.1.1b22.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.8.1.1b22.dist-info/METADATA,sha256=3E0i5Myo97Toxr8evUOB1zTZWTk0muKF8GiUXmR2aQ0,3357
+dcicutils-8.8.1.1b22.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.8.1.1b22.dist-info/entry_points.txt,sha256=51Q4F_2V10L0282W7HFjP4jdzW4K8lnWDARJQVFy_hw,270
+dcicutils-8.8.1.1b22.dist-info/RECORD,,