nci-cidc-api-modules 1.2.8__tar.gz → 1.2.10__tar.gz

{nci_cidc_api_modules-1.2.8/nci_cidc_api_modules.egg-info → nci_cidc_api_modules-1.2.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.8
+Version: 1.2.10
 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.2.8 → nci_cidc_api_modules-1.2.10}/cidc_api/models/models.py

@@ -30,6 +30,7 @@ __all__ = [
     "TRIAL_APPENDIX_A",
     "TRIAL_APPENDIX_A_CELL_THAT_ENDS_THE_HEADER",
     "REQUEST_LETTER",
+    "DETAILED_VALIDATION",
     "ADMIN_FILE_CATEGORIES",
     "FINAL_JOB_STATUS",
     "INGESTION_JOB_STATUSES",
@@ -3247,7 +3248,8 @@ def upload_manifest_json(
 
 TRIAL_APPENDIX_A = "trial_appendix_a"
 REQUEST_LETTER = "request_letter"
-ADMIN_FILE_CATEGORIES = [TRIAL_APPENDIX_A, REQUEST_LETTER]
+DETAILED_VALIDATION = "detailed_validation"
+ADMIN_FILE_CATEGORIES = [TRIAL_APPENDIX_A, REQUEST_LETTER, DETAILED_VALIDATION]
 
 
 class PreprocessedFiles(CommonColumns):
@@ -3419,7 +3421,7 @@ INGESTION_JOB_COLORS = {
 }
 # TODO If have "CANCELLED" concept or other final status, add here
 FINAL_JOB_STATUS = ["PUBLISHED"]
-TRIAL_APPENDIX_A_CELL_THAT_ENDS_THE_HEADER = "Entity"
+TRIAL_APPENDIX_A_CELL_THAT_ENDS_THE_HEADER = "Data Category"
 
 
 class IngestionJobs(CommonColumns):
@@ -3465,7 +3467,7 @@ class IngestionJobs(CommonColumns):
             if headers_ended:
                 if cell != "nan" and cell not in categories:
                     categories.append(cell)
-            elif cell == TRIAL_APPENDIX_A_CELL_THAT_ENDS_THE_HEADER:
+            elif cell.lower() == TRIAL_APPENDIX_A_CELL_THAT_ENDS_THE_HEADER.lower():
                 headers_ended = True
         if "data_dictionary" not in categories:
             # Ensure Data_Dictionary is always a required file category
@@ -3628,7 +3630,7 @@ class FileValidationErrors(CommonColumns):
 class ValidationConfigs(CommonColumns):
     __tablename__ = "validation_configs"
 
-    data_label = Column(String, nullable=True)
+    data_element = Column(String, nullable=True)
     validation = Column(String, nullable=True)
     scope = Column(String, nullable=True)
     active = Column(Boolean, nullable=False, default=True, server_default="true")

{nci_cidc_api_modules-1.2.8 → nci_cidc_api_modules-1.2.10}/cidc_api/shared/gcloud_client.py

@@ -985,6 +985,12 @@ def publish_hl_clinical_validation(job_id: int) -> None:
     _report = _encode_and_publish(str(job_id), GOOGLE_HL_CLINICAL_VALIDATION_TOPIC)
 
 
+def publish_detailed_validation(job_id: int) -> None:
+    """Start detailed validation and create the detailed validation preprocessed file"""
+    # Start validation asynchronously
+    _report = _encode_and_publish(str(job_id), GOOGLE_DL_CLINICAL_VALIDATION_TOPIC)
+
+
 def send_email(to_emails: List[str], subject: str, html_content: str, **kw) -> None:
     """
     Publish an email-to-send to the emails topic.

{nci_cidc_api_modules-1.2.8 → nci_cidc_api_modules-1.2.10/nci_cidc_api_modules.egg-info}/PKG-INFO

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