nci-cidc-api-modules 1.2.2__tar.gz → 1.2.4__tar.gz

{nci_cidc_api_modules-1.2.2/nci_cidc_api_modules.egg-info → nci_cidc_api_modules-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.2
+Version: 1.2.4
 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
@@ -29,7 +29,7 @@ Requires-Dist: requests>=2.32.5
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: certifi>=2025.8.3
 Requires-Dist: cloud-sql-python-connector[pg8000]>=1.18.4
-Requires-Dist: nci-cidc-schemas==0.28.3
+Requires-Dist: nci-cidc-schemas==0.28.5
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
@@ -395,7 +395,7 @@ API authentication relies on _identity tokens_ generated by Auth0 to verify that
 
 - It is a well-formatted JWT.
 - It has not yet expired.
-- Its cryptographic signature is valid.
+- Its cryptographic signature is valid. 
 
 JWTs are a lot like passports - they convey personal information, they’re issued by a trusted entity, and they expire after a certain time. Moreover, like passports, JWTs **can be stolen** and used to impersonate someone. As such, JWTs should be kept private and treated sort of like short-lived passwords.
 

{nci_cidc_api_modules-1.2.2 → nci_cidc_api_modules-1.2.4}/README.md

@@ -354,7 +354,7 @@ API authentication relies on _identity tokens_ generated by Auth0 to verify that
 
 - It is a well-formatted JWT.
 - It has not yet expired.
-- Its cryptographic signature is valid.
+- Its cryptographic signature is valid. 
 
 JWTs are a lot like passports - they convey personal information, they’re issued by a trusted entity, and they expire after a certain time. Moreover, like passports, JWTs **can be stolen** and used to impersonate someone. As such, JWTs should be kept private and treated sort of like short-lived passwords.
 

{nci_cidc_api_modules-1.2.2 → nci_cidc_api_modules-1.2.4}/cidc_api/models/files/facets.py

@@ -366,6 +366,16 @@ assay_facets: Facets = {
         "NPQ File": FacetConfig(["/nulisa/npq_file.csv", "NPQ file for NULISA run"]),
         "Raw Counts File": FacetConfig(["/nulisa/raw_counts_file.csv", "Raw counts file for NULISA run"]),
     },
+    "MALDI Glycan": {
+        "Metadata": FacetConfig(["/maldi_glycan/metadata.tsv", "Metadata for a MALDI Glycan run"]),
+        "Molecular Assignments File": FacetConfig(
+            ["/maldi_glycan/molecular_assignments.tsv", "Molecular Assignments file for a MALDI Glycan run"]
+        ),
+        "IBD File": FacetConfig(["/maldi_glycan/ibd_file.ibd", "IBD file for MALDI Glycan run"]),
+        "IMZML File": FacetConfig(["/maldi_glycan/imzml_file.imzml", "IMZML file for MALDI Glycan run"]),
+        "Channels": FacetConfig(["/maldi_glycan/channels.csv", "Channels csv file for MALDI Glycan run"]),
+        "Tiff Zip": FacetConfig(["/maldi_glycan/tiff.zip", "Tiff zip for MALDI Glycan run"]),
+    },
     "mIHC": {
         "Samples Report": FacetConfig(["/mihc/sample_report.csv"], "Samples report for mIHC run"),
         "Multitiffs": FacetConfig(["/mihc/multitiffs.tar.gz"], "Multi Tiffs file from mIHC run"),

{nci_cidc_api_modules-1.2.2 → nci_cidc_api_modules-1.2.4}/cidc_api/models/models.py

@@ -26,6 +26,7 @@ __all__ = [
     "FileValidationErrors",
     "IngestionJobs",
     "JobFileCategories",
+    "ValidationConfigs",
     "TRIAL_APPENDIX_A",
     "REQUEST_LETTER",
     "ADMIN_FILE_CATEGORIES",
@@ -3430,7 +3431,7 @@ class IngestionJobs(CommonColumns):
     trial_id = Column(String, nullable=False)
     version = Column(Integer, nullable=False)
     pending = Column(Boolean, nullable=False, default=False)
-    start_date = Column(Date, nullable=True)
+    start_date = Column(DateTime, nullable=True)
 
     @staticmethod
     @with_default_session
@@ -3607,3 +3608,18 @@ class FileValidationErrors(CommonColumns):
     @with_default_session
     def get_errors_for_job_sorted_by_file_id(cls, job_id: int, session: Session = None) -> list["FileValidationErrors"]:
         return session.query(cls).filter(cls.job_id == job_id).order_by(cls.file_id.asc()).all()
+
+
+class ValidationConfigs(CommonColumns):
+    __tablename__ = "validation_configs"
+
+    data_label = Column(String, nullable=True)
+    validation = Column(String, nullable=True)
+    scope = Column(String, nullable=True)
+    active = Column(Boolean, nullable=False, default=True, server_default="true")
+
+    @classmethod
+    @with_default_session
+    def get_active_configs_by_scope(cls, scope: str, session=None) -> list["ValidationConfigs"]:
+        """Return all active ValidationConfigs rows for the given scope."""
+        return session.query(cls).filter(cls.scope == scope, cls.active.is_(True)).all()

{nci_cidc_api_modules-1.2.2 → nci_cidc_api_modules-1.2.4/nci_cidc_api_modules.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.2
+Version: 1.2.4
 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
@@ -29,7 +29,7 @@ Requires-Dist: requests>=2.32.5
 Requires-Dist: jinja2>=3.1.6
 Requires-Dist: certifi>=2025.8.3
 Requires-Dist: cloud-sql-python-connector[pg8000]>=1.18.4
-Requires-Dist: nci-cidc-schemas==0.28.3
+Requires-Dist: nci-cidc-schemas==0.28.5
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
@@ -395,7 +395,7 @@ API authentication relies on _identity tokens_ generated by Auth0 to verify that
 
 - It is a well-formatted JWT.
 - It has not yet expired.
-- Its cryptographic signature is valid.
+- Its cryptographic signature is valid. 
 
 JWTs are a lot like passports - they convey personal information, they’re issued by a trusted entity, and they expire after a certain time. Moreover, like passports, JWTs **can be stolen** and used to impersonate someone. As such, JWTs should be kept private and treated sort of like short-lived passwords.
 

{nci_cidc_api_modules-1.2.2 → nci_cidc_api_modules-1.2.4}/nci_cidc_api_modules.egg-info/requires.txt

@@ -20,4 +20,4 @@ requests>=2.32.5
 jinja2>=3.1.6
 certifi>=2025.8.3
 cloud-sql-python-connector[pg8000]>=1.18.4
-nci-cidc-schemas==0.28.3
+nci-cidc-schemas==0.28.5

{nci_cidc_api_modules-1.2.2 → nci_cidc_api_modules-1.2.4}/requirements.modules.txt

@@ -20,4 +20,4 @@ requests>=2.32.5
 jinja2>=3.1.6
 certifi>=2025.8.3
 cloud-sql-python-connector[pg8000]>=1.18.4
-nci-cidc-schemas==0.28.3
+nci-cidc-schemas==0.28.5