nci-cidc-api-modules 1.1.32__tar.gz → 1.1.34__tar.gz

{nci_cidc_api_modules-1.1.32/nci_cidc_api_modules.egg-info → nci_cidc_api_modules-1.1.34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.1.32
+Version: 1.1.34
 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.4
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: certifi==2024.7.4
-Requires-Dist: nci-cidc-schemas==0.27.22
+Requires-Dist: nci-cidc-schemas==0.27.25
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page

{nci_cidc_api_modules-1.1.32 → nci_cidc_api_modules-1.1.34}/cidc_api/models/models.py

@@ -3241,9 +3241,9 @@ class PreprocessedFiles(CommonColumns):
 
     @classmethod
     @with_default_session
-    def delete_pending_files_by_category(cls, file_category: str, session: Session = None):
-        """Delete all pending files matching given file_category."""
-        records = cls.get_files_by_category_and_status(file_category, "pending", session=session)
+    def delete_pending_files_by_category(cls, file_category: str, trial_id: str = None, session: Session = None):
+        """Delete all pending files matching given file_category and optional trial_id."""
+        records = cls.get_files_by_category_and_status(file_category, "pending", trial_id=trial_id, session=session)
         for record in records:
             session.delete(record)
         session.commit()
@@ -3251,7 +3251,18 @@ class PreprocessedFiles(CommonColumns):
     @classmethod
     @with_default_session
     def get_files_by_category_and_status(
-        cls, file_category: str, status: str, session: Session = None
+        cls, file_category: str, status: str, trial_id: str = None, session: Session = None
     ) -> list["PreprocessedFiles"]:
-        """Return all files matching given file_category and status."""
-        return session.query(cls).filter_by(file_category=file_category, status=status).all()
+        """Return all files matching given file_category and status, optionally filtered by trial_id."""
+        query = session.query(cls).filter_by(file_category=file_category, status=status)
+        if trial_id:
+            query = query.filter_by(trial_id=trial_id)
+        return query.all()
+
+    @classmethod
+    @with_default_session
+    def get_file_by_category_and_version(
+        cls, file_category: str, version: int, session: Session = None
+    ) -> Optional["PreprocessedFiles"]:
+        """Return the file matching the given category and version number."""
+        return session.query(cls).filter_by(file_category=file_category, version=version).one_or_none()

{nci_cidc_api_modules-1.1.32 → nci_cidc_api_modules-1.1.34/nci_cidc_api_modules.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.1.32
+Version: 1.1.34
 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.4
 Requires-Dist: jinja2==3.1.6
 Requires-Dist: certifi==2024.7.4
-Requires-Dist: nci-cidc-schemas==0.27.22
+Requires-Dist: nci-cidc-schemas==0.27.25
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page

{nci_cidc_api_modules-1.1.32 → nci_cidc_api_modules-1.1.34}/nci_cidc_api_modules.egg-info/requires.txt

@@ -19,4 +19,4 @@ python-dotenv==0.10.3
 requests==2.32.4
 jinja2==3.1.6
 certifi==2024.7.4
-nci-cidc-schemas==0.27.22
+nci-cidc-schemas==0.27.25

{nci_cidc_api_modules-1.1.32 → nci_cidc_api_modules-1.1.34}/requirements.modules.txt

@@ -19,4 +19,4 @@ python-dotenv==0.10.3
 requests==2.32.4
 jinja2==3.1.6
 certifi==2024.7.4
-nci-cidc-schemas==0.27.22
+nci-cidc-schemas==0.27.25

{nci_cidc_api_modules-1.1.32 → nci_cidc_api_modules-1.1.34}/tests/test_api.py

@@ -412,7 +412,10 @@ def test_endpoint_urls(cidc_api):
         "/",
         "/clinical_data/files/master_appendix_a/current",
         "/clinical_data/files/master_appendix_a/pending",
+        "/clinical_data/files/master_appendix_a/versions",
+        "/clinical_data/files/master_appendix_a/versions/<int:version>",
         "/clinical_data/jobs",
+        "/clinical_data/trials/<string:trial_id>/files/trial_appendix_a/pending",
         "/downloadable_files/",
         "/downloadable_files/filelist",
         "/downloadable_files/compressed_batch",