nci-cidc-schemas 0.27.9__py2.py3-none-any.whl → 0.27.11__py2.py3-none-any.whl

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.11"

cidc_schemas/json_validation.py

@@ -7,6 +7,7 @@ import copy
 import functools
 import json
 import collections.abc
+import logging
 from contextlib import contextmanager
 from typing import Optional, Callable, Union
 
@@ -19,6 +20,8 @@ from jsonpointer import resolve_pointer
 from .constants import SCHEMA_DIR, METASCHEMA_PATH
 from .util import JSON
 
+logger = logging.getLogger("cidc_schemas.json_validation")
+
 
 class InDocRefNotFoundError(ValidationError):
     pass
@@ -106,8 +109,23 @@ 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:
+                        logger.info(f"_in_doc_refs_cache: {self._in_doc_refs_cache}")
+                        logger.info(f"scope '{scope}'")
+                        logger.info(
+                            "Internal error: _in_doc_refs_cache is None when trying to build cache. "
+                            "This usually means the validation context was improperly set up."
+                        )
+                        self._in_doc_refs_cache = dict()
+
                     # 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 +134,6 @@ class _Validator(jsonschema.Draft7Validator):
                             )
                         )
 
-        # see: https://docs.python.org/3/library/contextlib.html
         try:
             yield
         finally:

{nci_cidc_schemas-0.27.9.dist-info → nci_cidc_schemas-0.27.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_schemas
-Version: 0.27.9
+Version: 0.27.11
 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.dist-info → nci_cidc_schemas-0.27.11.dist-info}/RECORD

@@ -1,7 +1,7 @@
-cidc_schemas/__init__.py,sha256=MeM_c2q3soiProYuRKkz2LXkVeABgnSd8bmKvCUheOQ,136
+cidc_schemas/__init__.py,sha256=-TeAdsv6UvdB1rya3Sr7iATm0GVGUoRZsooOLXQi0Zg,136
 cidc_schemas/cli.py,sha256=gWiktRlraNH8Q0zNUae9dohKjPwBmcY0BJwdcQ_fIic,4099
 cidc_schemas/constants.py,sha256=RULs7pGuBAVq1teXymrfbVsK23ZowJvLuZlv0KcjL-Y,698
-cidc_schemas/json_validation.py,sha256=nHkSfTmBN7EeTrZVdbb8h6A64lWrJe5z0AIHiIy-YB0,22552
+cidc_schemas/json_validation.py,sha256=gH72JylIdFIZ1eNQaKja0nh9playSRVWt3DEeiFnmyc,23298
 cidc_schemas/migrations.py,sha256=Amg_T4cFgMzySD7yNnT_PWpqP7hwlTWGeHlI_RSXuRI,14766
 cidc_schemas/template.py,sha256=uvQNbkvusMq9D_1cnUMxT7j7Rf-iqq7o5nuZUhCaXY0,51428
 cidc_schemas/template_reader.py,sha256=xXtLRKu1y4FrPj8RgyGOmB2hlsCDXcuvMBWami2_jV8,13119
@@ -154,9 +154,9 @@ cidc_schemas/schemas/templates/manifests/tissue_slide_template.json,sha256=q2GmO
 cidc_schemas/schemas/templates/manifests/tumor_normal_pairing_template.json,sha256=lVJrGb28n-vyfjGBzhrzjn1lMKw1b4HXXmWtwA603v0,2797
 cidc_schemas/schemas/templates/manifests/tumor_tissue_dna_template.json,sha256=LpaoDXDS11NCa-Dv37N-tzEGomswQrx5fypkUcG7xJk,18956
 cidc_schemas/schemas/templates/manifests/tumor_tissue_rna_template.json,sha256=-gww6NCHbtbI5z7UmNSmKyPK3IqKCE8F6n4XwTAb_gk,18101
-nci_cidc_schemas-0.27.9.dist-info/licenses/LICENSE,sha256=zK77-w4rYCZBHAYJEGkcFuPXwKIsP7jMPZ2iQOXjzko,1072
-nci_cidc_schemas-0.27.9.dist-info/METADATA,sha256=NUnDS-D4-ulcj0l6fpp2VPhdjOraCbx2h92kOYcuxU4,4553
-nci_cidc_schemas-0.27.9.dist-info/WHEEL,sha256=MAQBAzGbXNI3bUmkDsiV_duv8i-gcdnLzw7cfUFwqhU,109
-nci_cidc_schemas-0.27.9.dist-info/entry_points.txt,sha256=kSyTzXeJQrJp_2ZX0GS_NnbJR8ceQKLBSgER46PM0hs,55
-nci_cidc_schemas-0.27.9.dist-info/top_level.txt,sha256=Wwb5Cu7QrnbmSJxI2d00e3-Mir36t0jTRnSulmfhi30,13
-nci_cidc_schemas-0.27.9.dist-info/RECORD,,
+nci_cidc_schemas-0.27.11.dist-info/licenses/LICENSE,sha256=zK77-w4rYCZBHAYJEGkcFuPXwKIsP7jMPZ2iQOXjzko,1072
+nci_cidc_schemas-0.27.11.dist-info/METADATA,sha256=YdvvEgREhuErbyOhogD-38VvaePlYjTr9SElWiv1WcA,4554
+nci_cidc_schemas-0.27.11.dist-info/WHEEL,sha256=AeO2BvogYWm3eGaHCvhzmUYt8ia7KfURiHzO_1atlys,109
+nci_cidc_schemas-0.27.11.dist-info/entry_points.txt,sha256=kSyTzXeJQrJp_2ZX0GS_NnbJR8ceQKLBSgER46PM0hs,55
+nci_cidc_schemas-0.27.11.dist-info/top_level.txt,sha256=Wwb5Cu7QrnbmSJxI2d00e3-Mir36t0jTRnSulmfhi30,13
+nci_cidc_schemas-0.27.11.dist-info/RECORD,,

{nci_cidc_schemas-0.27.9.dist-info → nci_cidc_schemas-0.27.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.1)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any