nci-cidc-api-modules 1.1.11__py3-none-any.whl → 1.1.12__py3-none-any.whl

cidc_api/models/models.py

@@ -1121,13 +1121,15 @@ class TrialMetadata(CommonColumns):
     _metadata_idx = Index("metadata_idx", metadata_json, postgresql_using="gin")
 
     @staticmethod
-    def validate_metadata_json(metadata_json: dict) -> dict:
-        # 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.
+    def validate_metadata_json(metadata_json: dict, strip_metadata=True) -> dict:
+        # Prior to running trial_metadata_validator.iter_error_messages on the metadata_json, if
+        # strip_metadata=True, will 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
+        metadata_to_validate = (
+            json_validation.strip_metadata_for_validation(metadata_json)
+            if strip_metadata
+            else metadata_json
         )
         errs = trial_metadata_validator.iter_error_messages(metadata_to_validate)
         messages = list(f"'metadata_json': {err}" for err in errs)

{nci_cidc_api_modules-1.1.11.dist-info → nci_cidc_api_modules-1.1.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.1.11
+Version: 1.1.12
 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

{nci_cidc_api_modules-1.1.11.dist-info → nci_cidc_api_modules-1.1.12.dist-info}/RECORD

@@ -8,7 +8,7 @@ cidc_api/csms/auth.py,sha256=25Yma2Kz3KLENAPSeBYacFuSZXng-EDgmgInKBsRyP0,3191
 cidc_api/models/__init__.py,sha256=bl445G8Zic9YbhZ8ZBni07wtBMhLJRMBA-JqjLxx2bw,66
 cidc_api/models/csms_api.py,sha256=_uB9ZoxCFxKO8ZDTxCjS0CpeQg14EdlkEqnwyAFyYFQ,31377
 cidc_api/models/migrations.py,sha256=gp9vtkYbA9FFy2s-7woelAmsvQbJ41LO2_DY-YkFIrQ,11464
-cidc_api/models/models.py,sha256=C0s28yCozvZ6K5xpSiVgURTci8fjQ2_wJlxU4OAQz-I,129135
+cidc_api/models/models.py,sha256=xoTl1b92EzwOby5Dct6AgtN9l3wEUB1NdhhrSEHwMR4,129248
 cidc_api/models/schemas.py,sha256=7tDYtmULuzTt2kg7RorWhte06ffalgpQKrFiDRGcPEQ,2711
 cidc_api/models/files/__init__.py,sha256=8BMTnUSHzUbz0lBeEQY6NvApxDD3GMWMduoVMos2g4Y,213
 cidc_api/models/files/details.py,sha256=h6R0p_hi-ukHsO7HV-3Wukccp0zRLJ1Oie_JNA_7Pl0,62274
@@ -19,8 +19,8 @@ cidc_api/shared/emails.py,sha256=FXW9UfI2bCus350SQuL7ZQYq1Vg-vGXaGWmRfA6z2nM,440
 cidc_api/shared/gcloud_client.py,sha256=7dDs0crLMJKdIp4IDSfrZBMB3h-zvWNieB81azoeLO4,33746
 cidc_api/shared/jose.py,sha256=QO30uIhbYDwzPEWWJXz0PfyV7E1AZHReEZJUVT70UJY,1844
 cidc_api/shared/rest_utils.py,sha256=LMfBpvJRjkfQjCzVXuhTTe4Foz4wlvaKg6QntyR-Hkc,6648
-nci_cidc_api_modules-1.1.11.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
-nci_cidc_api_modules-1.1.11.dist-info/METADATA,sha256=b72D5JEyi8PEsRLq9c5T-AnKQvVB-LKVD_n8gbbbXhM,41284
-nci_cidc_api_modules-1.1.11.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nci_cidc_api_modules-1.1.11.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
-nci_cidc_api_modules-1.1.11.dist-info/RECORD,,
+nci_cidc_api_modules-1.1.12.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
+nci_cidc_api_modules-1.1.12.dist-info/METADATA,sha256=d000X8YPVI4KWjmw1ty9vXrcb1C-C-qUUHheW8_3d2U,41284
+nci_cidc_api_modules-1.1.12.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nci_cidc_api_modules-1.1.12.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
+nci_cidc_api_modules-1.1.12.dist-info/RECORD,,