dcicutils 8.14.3.1b2__py3-none-any.whl → 8.14.3.1b4__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.
Files changed (7) hide show
  1. dcicutils/portal_utils.py +6 -0
  2. dcicutils/structured_data.py +1 -1
  3. {dcicutils-8.14.3.1b2.dist-info → dcicutils-8.14.3.1b4.dist-info}/METADATA +1 -1
  4. {dcicutils-8.14.3.1b2.dist-info → dcicutils-8.14.3.1b4.dist-info}/RECORD +7 -7
  5. {dcicutils-8.14.3.1b2.dist-info → dcicutils-8.14.3.1b4.dist-info}/LICENSE.txt +0 -0
  6. {dcicutils-8.14.3.1b2.dist-info → dcicutils-8.14.3.1b4.dist-info}/WHEEL +0 -0
  7. {dcicutils-8.14.3.1b2.dist-info → dcicutils-8.14.3.1b4.dist-info}/entry_points.txt +0 -0
dcicutils/portal_utils.py CHANGED
@@ -294,6 +294,12 @@ class Portal:
294
294
  def get_health(self) -> OptionalResponse:
295
295
  return self.get("/health")
296
296
 
297
+ def get_version(self) -> Optional[str]:
298
+ try:
299
+ return self.get_health().json()["project_version"]
300
+ except Exception:
301
+ return None
302
+
297
303
  def ping(self) -> bool:
298
304
  try:
299
305
  return self.get_health().status_code == 200
dcicutils/structured_data.py CHANGED
@@ -318,7 +318,7 @@ class StructuredDataSet:
318
318
  order = {Schema.type_name(key): index for index, key in enumerate(self._order)} if self._order else {}
319
319
  for sheet_name in sorted(excel.sheet_names, key=lambda key: order.get(Schema.type_name(key), sys.maxsize)):
320
320
  self._load_reader(excel.sheet_reader(sheet_name), type_name=Schema.type_name(sheet_name))
321
- if self._validator_sheet_hook:
321
+ if self._validator_sheet_hook and self.data.get(sheet_name):
322
322
  self._validator_sheet_hook(self, sheet_name, self.data[sheet_name])
323
323
  # TODO: Do we really need progress reporting for the below?
324
324
  # Check for unresolved reference errors which really are not because of ordering.
{dcicutils-8.14.3.1b2.dist-info → dcicutils-8.14.3.1b4.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: dcicutils
3
- Version: 8.14.3.1b2
3
+ Version: 8.14.3.1b4
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
{dcicutils-8.14.3.1b2.dist-info → dcicutils-8.14.3.1b4.dist-info}/RECORD RENAMED
@@ -49,7 +49,7 @@ dcicutils/misc_utils.py,sha256=mO-5i0IUZ2U-P7rnQcC9VURzQ35pz7jFsMZdq6BB_QM,11592
49
49
  dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
50
50
  dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
51
51
  dcicutils/portal_object_utils.py,sha256=Az3n1aL-PQkN5gOFE6ZqC2XkYsqiwKlq7-tZggs1QN4,11062
52
- dcicutils/portal_utils.py,sha256=Ub4rlG6Ir4JVSH1KHQRRtJTU_5yBGzVOKrdIkhqJMLQ,45268
52
+ dcicutils/portal_utils.py,sha256=4mHNdMcaQDUVPfiDYwGeIqjerNuDRnNloUDIZl41r9g,45439
53
53
  dcicutils/progress_bar.py,sha256=R3bWLMYM3Xq9PY7U0JadcFT1m7QmCbrbDp9qs9_Kf_c,19472
54
54
  dcicutils/project_utils.py,sha256=qPdCaFmWUVBJw4rw342iUytwdQC0P-XKpK4mhyIulMM,31250
55
55
  dcicutils/qa_checkers.py,sha256=j0kzo_T5VduKTxgsMTp7xjneyNokumZzI_iz55Y0Jjs,20505
@@ -66,7 +66,7 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
66
66
  dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
67
67
  dcicutils/snapshot_utils.py,sha256=YDeI3vD-MhAtHwKDzfEm2q-n3l-da2yRpRR3xp0Ah1M,23021
68
68
  dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
69
- dcicutils/structured_data.py,sha256=VMPuY3Dnz9IaPcEdwLLgGorK3AkdJaymX6z8e2Nj1G8,66352
69
+ dcicutils/structured_data.py,sha256=PbsdEdeC01RvBq9SB7ozMu3oNDJrMlVyHQcBnwAzAkU,66382
70
70
  dcicutils/submitr/progress_constants.py,sha256=5bxyX77ql8qEJearfHEvsvXl7D0GuUODW0T65mbRmnE,2895
71
71
  dcicutils/submitr/ref_lookup_strategy.py,sha256=VJN-Oo0LLna6Vo2cu47eC-eU-yUC9NFlQP29xajejVU,4741
72
72
  dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
@@ -75,8 +75,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
75
75
  dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
76
76
  dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
77
77
  dcicutils/zip_utils.py,sha256=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
78
- dcicutils-8.14.3.1b2.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
79
- dcicutils-8.14.3.1b2.dist-info/METADATA,sha256=86osykcp2FdA3E94d9EeO0tFDCVB3jrXuQe_fBksLv0,3446
80
- dcicutils-8.14.3.1b2.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
81
- dcicutils-8.14.3.1b2.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
82
- dcicutils-8.14.3.1b2.dist-info/RECORD,,
78
+ dcicutils-8.14.3.1b4.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
79
+ dcicutils-8.14.3.1b4.dist-info/METADATA,sha256=Rn9ZoIveSCzsgMWbLZgKaakQCKHRKYUKGRmNMZNmJus,3446
80
+ dcicutils-8.14.3.1b4.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
81
+ dcicutils-8.14.3.1b4.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
82
+ dcicutils-8.14.3.1b4.dist-info/RECORD,,