added hook for data_readers.Excel.effective_sheet_name to allow multi…

…ple sheets of same type

dcicutils/structured_data.py

@@ -327,9 +327,9 @@ def get_counts() -> Tuple[int, int]:
             # now can have multiple sheets of the same type (impossible before as sheet names need
             # to be unique); this is simply a mechanism to allow the user to partition/organize their
             # sheets with some data/rows for a given type split across multiple actual sheets.
-            type_name = Schema.type_name(excel.effective_sheet_name(sheet_name))
+            effective_sheet_name = excel.effective_sheet_name(sheet_name)
+            type_name = Schema.type_name(effective_sheet_name)
             self._load_reader(excel.sheet_reader(sheet_name), type_name=type_name)
-            # self._load_reader(excel.sheet_reader(sheet_name), type_name=Schema.type_name(sheet_name))
             if self._validator_sheet_hook and self.data.get(sheet_name):
                 self._validator_sheet_hook(self, sheet_name, self.data[sheet_name])
         # TODO: Do we really need progress reporting for the below?

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.16.6.1b5"  # TODO: 8.17.0
+version = "8.16.6.1b6"  # TODO: 8.17.0
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <[email protected]>"]
 license = "MIT"