nci-cidc-api-modules 1.1.32__py3-none-any.whl → 1.1.34__py3-none-any.whl

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.dist-info → nci_cidc_api_modules-1.1.34.dist-info}/METADATA

@@ -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.dist-info → nci_cidc_api_modules-1.1.34.dist-info}/RECORD

@@ -5,7 +5,7 @@ cidc_api/config/secrets.py,sha256=jRFj7W43pWuPf9DZQLCKF7WPXf5cUv-BAaS3ASqhV_Q,14
 cidc_api/config/settings.py,sha256=mA-4r7oB60uFepYtl5abbPigjwX8aBz__qCJXdcWWbs,4272
 cidc_api/models/__init__.py,sha256=bl445G8Zic9YbhZ8ZBni07wtBMhLJRMBA-JqjLxx2bw,66
 cidc_api/models/migrations.py,sha256=gp9vtkYbA9FFy2s-7woelAmsvQbJ41LO2_DY-YkFIrQ,11464
-cidc_api/models/models.py,sha256=WU9nCAyYJEi1_TWyjSCrJ8XX1btPNa2xO7tpDWGccdU,131992
+cidc_api/models/models.py,sha256=JceOfSBetV6ifhYIPL4Qp0T3YpG55M016YvEajLUQ8o,132587
 cidc_api/models/schemas.py,sha256=7tDYtmULuzTt2kg7RorWhte06ffalgpQKrFiDRGcPEQ,2711
 cidc_api/models/files/__init__.py,sha256=8BMTnUSHzUbz0lBeEQY6NvApxDD3GMWMduoVMos2g4Y,213
 cidc_api/models/files/details.py,sha256=WrWPxJqlsteinoNbGTaQ3fcxgvChqLGJ9vY7H829jtk,62842
@@ -16,8 +16,8 @@ cidc_api/shared/emails.py,sha256=GY-l0EkoVU_3hjV0g-xo7N9d1iyCdluyq_arftEPPe0,498
 cidc_api/shared/gcloud_client.py,sha256=oD7Y3Glp1ZrPYkonv7DvX1koGtF30lgm3ENXYQ7G5cI,35634
 cidc_api/shared/jose.py,sha256=-qzGzEDAlokEp9E7WtBtQkXyyfPWTYXlwYpCqVJWmqM,1830
 cidc_api/shared/rest_utils.py,sha256=RwR30WOUAYCxL7V-i2totEyeriG30GbBDvBcpLXhM9w,6594
-nci_cidc_api_modules-1.1.32.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
-nci_cidc_api_modules-1.1.32.dist-info/METADATA,sha256=K5SKeS-yZim2JWbhfsbrFo7G2vSegE4uYk5xy3lgtIA,41285
-nci_cidc_api_modules-1.1.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nci_cidc_api_modules-1.1.32.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
-nci_cidc_api_modules-1.1.32.dist-info/RECORD,,
+nci_cidc_api_modules-1.1.34.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
+nci_cidc_api_modules-1.1.34.dist-info/METADATA,sha256=RLRMhMdB-8zd-vX3O77F8VEdQf4cHISKnBF7fy-aEMc,41285
+nci_cidc_api_modules-1.1.34.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nci_cidc_api_modules-1.1.34.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
+nci_cidc_api_modules-1.1.34.dist-info/RECORD,,