nci-cidc-schemas 0.27.9__tar.gz → 0.27.10__tar.gz

{nci_cidc_schemas-0.27.9/nci_cidc_schemas.egg-info → nci_cidc_schemas-0.27.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_schemas
-Version: 0.27.9
+Version: 0.27.10
 Summary: The CIDC data model and tools for working with it.
 Home-page: https://github.com/NCI-CIDC/cidc-schemas
 Author: NCI

{nci_cidc_schemas-0.27.9 → nci_cidc_schemas-0.27.10}/cidc_schemas/__init__.py

@@ -2,4 +2,4 @@
 
 __author__ = """NCI"""
 __email__ = "nci-cidc-tools-admin@mail.nih.gov"
-__version__ = "0.27.09"
+__version__ = "0.27.10"

{nci_cidc_schemas-0.27.9 → nci_cidc_schemas-0.27.10}/cidc_schemas/json_validation.py

@@ -106,8 +106,22 @@ class _Validator(jsonschema.Draft7Validator):
             if "matched_paths" in search:
                 for path in search["matched_paths"]:
                     scope = {"root": self.schema}
-                    exec(f"ref_path_pattern = {path}", scope)
-                    ref_path_pattern = scope["ref_path_pattern"]
+                    try:
+                        ref_path_pattern = eval(path, scope)
+                    except Exception as e:
+                        raise RuntimeError(
+                            f"Failed to evaluate in_doc_ref_pattern at path '{path}': {e}"
+                        ) from e
+
+                    # protect against None cache
+                    if self._in_doc_refs_cache is None:
+                        print(f"_in_doc_refs_cache: {self._in_doc_refs_cache}")
+                        print(f"scope '{scope}'")
+                        raise RuntimeError(
+                            "Internal error: _in_doc_refs_cache is None when trying to build cache. "
+                            "This usually means the validation context was improperly set up."
+                        )
+
                     # If there are no cached values for this ref path pattern, collect them
                     if ref_path_pattern not in self._in_doc_refs_cache:
                         self._in_doc_refs_cache[ref_path_pattern] = (
@@ -116,7 +130,6 @@ class _Validator(jsonschema.Draft7Validator):
                             )
                         )
 
-        # see: https://docs.python.org/3/library/contextlib.html
         try:
             yield
         finally:

{nci_cidc_schemas-0.27.9 → nci_cidc_schemas-0.27.10/nci_cidc_schemas.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_schemas
-Version: 0.27.9
+Version: 0.27.10
 Summary: The CIDC data model and tools for working with it.
 Home-page: https://github.com/NCI-CIDC/cidc-schemas
 Author: NCI