dcicutils 8.13.3.1b10__tar.gz → 8.13.3.1b12__tar.gz

{dcicutils-8.13.3.1b10 → dcicutils-8.13.3.1b12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.13.3.1b10
+Version: 8.13.3.1b12
 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.13.3.1b10 → dcicutils-8.13.3.1b12}/dcicutils/misc_utils.py

@@ -984,14 +984,15 @@ def str_to_bool(x: Optional[str]) -> Optional[bool]:
         raise ValueError(f"An argument to str_or_bool must be a string or None: {x!r}")
 
 
-def to_integer(value: str, fallback: Optional[Any] = None) -> Optional[Any]:
+def to_integer(value: str, fallback: Optional[Any] = None, strict: bool = False) -> Optional[Any]:
     try:
         return int(value)
     except Exception:
-        try:
-            return int(float(value))
-        except Exception:
-            pass
+        if strict is not True:
+            try:
+                return int(float(value))
+            except Exception:
+                pass
     return fallback
 
 

{dcicutils-8.13.3.1b10 → dcicutils-8.13.3.1b12}/dcicutils/structured_data.py

@@ -57,7 +57,7 @@ class StructuredDataSet:
                  ref_lookup_nocache: bool = False,
                  norefs: bool = False, merge: bool = False,
                  progress: Optional[Callable] = None,
-                 row_reader_hook: Optional[Callable] = None,
+                 validator_hook: Optional[Callable] = None,
                  debug_sleep: Optional[str] = None) -> None:
         self._progress = progress if callable(progress) else None
         self._data = {}
@@ -76,7 +76,7 @@ class StructuredDataSet:
         self._autoadd_properties = autoadd if isinstance(autoadd, dict) and autoadd else None
         self._norefs = True if norefs is True else False
         self._merge = True if merge is True else False  # New merge functionality (2024-05-25)
-        self._row_reader_hook = row_reader_hook if callable(row_reader_hook) else None  # Testing support (2024-06-12)
+        self._validator_hook = validator_hook if callable(validator_hook) else None  # Testing support (2024-06-12)
         self._debug_sleep = None
         if debug_sleep:
             try:
@@ -379,8 +379,13 @@ class StructuredDataSet:
                 structured_row_template = _StructuredRowTemplate(reader.header, schema)
             structured_row = structured_row_template.create_row()
             for column_name, value in row.items():
-                if self._row_reader_hook:
-                    value = self._row_reader_hook(reader.sheet_name, column_name, value)
+                if self._validator_hook:
+                    value, validator_error = self._validator_hook(reader.sheet_name, column_name, value)
+                    if validator_error:
+                        self._note_error({
+                            "src": create_dict(type=schema_name, row=reader.row_number),
+                            "error": validator_error
+                        }, "validation")
                 structured_row_template.set_value(structured_row, column_name, value, reader.file, reader.row_number)
                 if self._autoadd_properties:
                     self._add_properties(structured_row, self._autoadd_properties, schema)
@@ -706,7 +711,7 @@ class Schema(SchemaBase):
 
     def _map_function_integer(self, typeinfo: dict) -> Callable:
         def map_integer(value: str, src: Optional[str]) -> Any:
-            return to_integer(value, value)
+            return to_integer(value, value, strict=True)
         return map_integer
 
     def _map_function_number(self, typeinfo: dict) -> Callable:

{dcicutils-8.13.3.1b10 → dcicutils-8.13.3.1b12}/pyproject.toml

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