dcicutils 8.13.3.1b10__py3-none-any.whl → 8.13.3.1b12__py3-none-any.whl

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/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.dist-info → dcicutils-8.13.3.1b12.dist-info}/METADATA

@@ -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.dist-info → dcicutils-8.13.3.1b12.dist-info}/RECORD

@@ -45,7 +45,7 @@ dcicutils/license_policies/park-lab-gpl-pipeline.jsonc,sha256=vLZkwm3Js-kjV44nug
 dcicutils/license_policies/park-lab-pipeline.jsonc,sha256=9qlY0ASy3iUMQlr3gorVcXrSfRHnVGbLhkS427UaRy4,283
 dcicutils/license_utils.py,sha256=2Yxnh1T1iuMe6wluwbvpFO_zYSGPxB4-STAMc-vz-YM,47202
 dcicutils/log_utils.py,sha256=7pWMc6vyrorUZQf-V-M3YC6zrPgNhuV_fzm9xqTPph0,10883
-dcicutils/misc_utils.py,sha256=-syqTAj8DESiiP_KHoyBv9VvfboFYB03QbBlmXnBZXw,109423
+dcicutils/misc_utils.py,sha256=YRUjQ4Yg7GapOGxN_KWB96hcl1XJVGr24ktHZvD9g6A,109492
 dcicutils/obfuscation_utils.py,sha256=fo2jOmDRC6xWpYX49u80bVNisqRRoPskFNX3ymFAmjw,5963
 dcicutils/opensearch_utils.py,sha256=V2exmFYW8Xl2_pGFixF4I2Cc549Opwe4PhFi5twC0M8,1017
 dcicutils/portal_object_utils.py,sha256=Az3n1aL-PQkN5gOFE6ZqC2XkYsqiwKlq7-tZggs1QN4,11062
@@ -66,7 +66,7 @@ dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=YDeI3vD-MhAtHwKDzfEm2q-n3l-da2yRpRR3xp0Ah1M,23021
 dcicutils/ssl_certificate_utils.py,sha256=F0ifz_wnRRN9dfrfsz7aCp4UDLgHEY8LaK7PjnNvrAQ,9707
-dcicutils/structured_data.py,sha256=TA7kJ-utVj_xa5XnVs7VaG_XQicl5MUWmrVkDm0N8qE,64471
+dcicutils/structured_data.py,sha256=1w832RpR6pKklRyV4KgMnTkL8PBlCOhwKZ8ED88dMjE,64761
 dcicutils/submitr/progress_constants.py,sha256=5bxyX77ql8qEJearfHEvsvXl7D0GuUODW0T65mbRmnE,2895
 dcicutils/submitr/ref_lookup_strategy.py,sha256=VJN-Oo0LLna6Vo2cu47eC-eU-yUC9NFlQP29xajejVU,4741
 dcicutils/task_utils.py,sha256=MF8ujmTD6-O2AC2gRGPHyGdUrVKgtr8epT5XU8WtNjk,8082
@@ -75,8 +75,8 @@ 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=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
-dcicutils-8.13.3.1b10.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.13.3.1b10.dist-info/METADATA,sha256=E8KQaPEnwlq1Ogqm5ZJB655vi5zP1jpNUCMopDMdYzI,3440
-dcicutils-8.13.3.1b10.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.13.3.1b10.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.13.3.1b10.dist-info/RECORD,,
+dcicutils-8.13.3.1b12.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.13.3.1b12.dist-info/METADATA,sha256=noJFXOxAJ5PwjMw07PBOj1McLkRQ4Ie1WVCMoq72Gls,3440
+dcicutils-8.13.3.1b12.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.13.3.1b12.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.13.3.1b12.dist-info/RECORD,,