dcicutils 8.16.6__tar.gz → 8.16.6.1b1__tar.gz

{dcicutils-8.16.6 → dcicutils-8.16.6.1b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.16.6
+Version: 8.16.6.1b1
 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.16.6 → dcicutils-8.16.6.1b1}/dcicutils/structured_data.py

@@ -59,6 +59,7 @@ class StructuredDataSet:
                  progress: Optional[Callable] = None,
                  validator_hook: Optional[Callable] = None,
                  validator_sheet_hook: Optional[Callable] = None,
+                 row_reader_mapper: Optional[Callable] = None,
                  debug_sleep: Optional[str] = None) -> None:
         self._progress = progress if callable(progress) else None
         self._data = {}
@@ -79,6 +80,7 @@ class StructuredDataSet:
         self._merge = True if merge is True else False  # New merge functionality (2024-05-25)
         self._validator_hook = validator_hook if callable(validator_hook) else None
         self._validator_sheet_hook = validator_sheet_hook if callable(validator_sheet_hook) else None
+        self._row_reader_mapper = row_reader_mapper if callable(row_reader_mapper) else None
         self._debug_sleep = None
         if debug_sleep:
             try:
@@ -374,7 +376,10 @@ class StructuredDataSet:
         schema = None
         noschema = False
         structured_row_template = None
+        sheet_name = reader.sheet_name if self._row_reader_mapper and hasattr(reader, "sheet_name") else None
         for row in reader:
+            if self._row_reader_mapper and (not isinstance(row := self._row_reader_mapper(row, sheet_name), dict)):
+                continue
             self._nrows += 1
             if self._debug_sleep:
                 time.sleep(float(self._debug_sleep))

{dcicutils-8.16.6 → dcicutils-8.16.6.1b1}/pyproject.toml

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