nci-cidc-api-modules 1.0.33__tar.gz → 1.1.1__tar.gz

{nci_cidc_api_modules-1.0.33/nci_cidc_api_modules.egg-info → nci_cidc_api_modules-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nci_cidc_api_modules
-Version: 1.0.33
+Version: 1.1.1
 Summary: SQLAlchemy data models and configuration tools used in the NCI CIDC API
 Home-page: https://github.com/NCI-CIDC/cidc-api-gae
 License: MIT license
@@ -28,7 +28,7 @@ Requires-Dist: python-dotenv==0.10.3
 Requires-Dist: requests==2.32.3
 Requires-Dist: jinja2==3.1.5
 Requires-Dist: certifi==2024.7.4
-Requires-Dist: nci-cidc-schemas==0.26.38
+Requires-Dist: nci-cidc-schemas==0.27.01
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page

{nci_cidc_api_modules-1.0.33 → nci_cidc_api_modules-1.1.1}/cidc_api/models/csms_api.py

@@ -456,7 +456,6 @@ def insert_manifest_into_blob(
 
     logger.info("Patch for %s manifest %s:\n%s", trial_id, manifest_id, patch)
     # merge and validate the data
-    # the existence of the correct cohort and collection_event names are checked here
     merged, errs = merge_clinical_trial_metadata(patch, trial_md.metadata_json)
     if errs:
         raise RuntimeError({"prism errors": [str(e) for e in errs]})

{nci_cidc_api_modules-1.0.33 → nci_cidc_api_modules-1.1.1}/cidc_api/models/models.py

@@ -1121,7 +1121,14 @@ class TrialMetadata(CommonColumns):
 
     @staticmethod
     def validate_metadata_json(metadata_json: dict) -> dict:
-        errs = trial_metadata_validator.iter_error_messages(metadata_json)
+        # Prior to running trial_metadata_validator.iter_error_messages on the metadata_json,
+        # strip out unnecessary manifest data for the validation so that existing manifest data
+        # that no longer conform to the post-CSMS-integration schema can be kept.
+        # See more details in the strip_metadata_for_validation function docs.
+        metadata_to_validate = json_validation.strip_metadata_for_validation(
+            metadata_json
+        )
+        errs = trial_metadata_validator.iter_error_messages(metadata_to_validate)
         messages = list(f"'metadata_json': {err}" for err in errs)
         if messages:
             raise ValidationMultiError(messages)

{nci_cidc_api_modules-1.0.33 → nci_cidc_api_modules-1.1.1/nci_cidc_api_modules.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nci_cidc_api_modules
-Version: 1.0.33
+Version: 1.1.1
 Summary: SQLAlchemy data models and configuration tools used in the NCI CIDC API
 Home-page: https://github.com/NCI-CIDC/cidc-api-gae
 License: MIT license
@@ -28,7 +28,7 @@ Requires-Dist: python-dotenv==0.10.3
 Requires-Dist: requests==2.32.3
 Requires-Dist: jinja2==3.1.5
 Requires-Dist: certifi==2024.7.4
-Requires-Dist: nci-cidc-schemas==0.26.38
+Requires-Dist: nci-cidc-schemas==0.27.01
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page

{nci_cidc_api_modules-1.0.33 → nci_cidc_api_modules-1.1.1}/nci_cidc_api_modules.egg-info/requires.txt

@@ -19,4 +19,4 @@ python-dotenv==0.10.3
 requests==2.32.3
 jinja2==3.1.5
 certifi==2024.7.4
-nci-cidc-schemas==0.26.38
+nci-cidc-schemas==0.27.01

{nci_cidc_api_modules-1.0.33 → nci_cidc_api_modules-1.1.1}/pyproject.toml

@@ -15,7 +15,7 @@ authors = []
 readme = "README.md"
 
 [tool.poetry.dependencies]
-python = ">=3.9,<3.10"
+python = ">3.9.0,<3.9.1 || >3.9.1,<3.10"
 flask-cors = "5.0.0"
 flask-cachecontrol = "0.3.0"
 six = "1.13.0"

{nci_cidc_api_modules-1.0.33 → nci_cidc_api_modules-1.1.1}/requirements.modules.txt

@@ -19,4 +19,4 @@ python-dotenv==0.10.3
 requests==2.32.3
 jinja2==3.1.5
 certifi==2024.7.4
-nci-cidc-schemas==0.26.38
+nci-cidc-schemas==0.27.01