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

cidc_api/models/models.py

@@ -3229,12 +3229,15 @@ class PreprocessedFiles(CommonColumns):
     @classmethod
     @with_default_session
     def archive_current_files(cls, file_category: str, session: Session = None):
-        """Update any 'current' files in the given category to 'archived'."""
+        """Update any 'current' files in the given category to 'archived'. Returns latest existing version number."""
+        current_version = 0
         current_files = cls.get_files_by_category_and_status(file_category, "current", session=session)
         for file in current_files:
             file.status = "archived"
             file._updated = datetime.now()
+            current_version = file.version if file.version > current_version else current_version
         session.commit()
+        return current_version
 
     @classmethod
     @with_default_session

cidc_api/shared/gcloud_client.py

@@ -237,7 +237,6 @@ def upload_file_to_gcs(file: FileStorage, bucket_name: str, gcs_folder: str) ->
 
 def move_gcs_file(bucket_name: str, existing_path: str, to_folder: str, append_timestamp: bool = True) -> str:
     """Move a file within a GCS bucket to a new folder, optionally appending a timestamp to the filename."""
-    bucket = _get_bucket(bucket_name)
     filename = os.path.basename(existing_path)
     if append_timestamp:
         filename = _append_iso_timestamp_to_filename(filename)
@@ -250,6 +249,7 @@ def move_gcs_file(bucket_name: str, existing_path: str, to_folder: str, append_t
         logger.info(f"Would've moved {existing_path} to {new_gcs_file_path} in {bucket_name}")
         return new_gcs_file_path
 
+    bucket = _get_bucket(bucket_name)
     source_blob = bucket.blob(existing_path)
     if not source_blob.exists():
         raise Exception("Expected file not found in GCS")
@@ -263,10 +263,10 @@ def move_gcs_file(bucket_name: str, existing_path: str, to_folder: str, append_t
 
 def delete_items_from_folder(bucket_name: str, folder: str):
     """Deletes all blobs from the specified folder in the specified bucket."""
-    bucket = _get_bucket(bucket_name)
     if ENV == "dev" and not DEV_USE_GCS:
         logger.info(f"Would've deleted file(s) from {folder} in {bucket_name}")
         return
+    bucket = _get_bucket(bucket_name)
     existing_blobs = bucket.list_blobs(prefix=folder)
     for blob in existing_blobs:
         blob.delete()

{nci_cidc_api_modules-1.1.31.dist-info → nci_cidc_api_modules-1.1.32.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.1.31
+Version: 1.1.32
 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
@@ -25,10 +25,10 @@ Requires-Dist: pyarrow==14.0.1
 Requires-Dist: numpy<2,>=1.16.5
 Requires-Dist: pandas==1.5.3
 Requires-Dist: python-dotenv==0.10.3
-Requires-Dist: requests==2.32.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.21
+Requires-Dist: nci-cidc-schemas==0.27.22
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page

{nci_cidc_api_modules-1.1.31.dist-info → nci_cidc_api_modules-1.1.32.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=JAvKhX2VnbhavfPkGelBIa3M8Qi6JaFKvydJmmvqZ1U,131795
+cidc_api/models/models.py,sha256=WU9nCAyYJEi1_TWyjSCrJ8XX1btPNa2xO7tpDWGccdU,131992
 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
@@ -13,11 +13,11 @@ cidc_api/models/files/facets.py,sha256=JqCmwcjYYSz7XK4bAokSE9i71C8t9EQ4Jtbv7npth
 cidc_api/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cidc_api/shared/auth.py,sha256=PHqmVGkqDjbmUofytVFwD_9ssgUomESl3fFtFHPwZYQ,9062
 cidc_api/shared/emails.py,sha256=GY-l0EkoVU_3hjV0g-xo7N9d1iyCdluyq_arftEPPe0,4989
-cidc_api/shared/gcloud_client.py,sha256=ko-3kGRyHI0RcIgoA0r_qVZUcDUGjd9t6-5pXJc3A7s,35634
+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.31.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
-nci_cidc_api_modules-1.1.31.dist-info/METADATA,sha256=92LzhqUCRQiUvKbuj0Gs_lZ3OrmPBzBHfrNZQ_EjrwQ,41285
-nci_cidc_api_modules-1.1.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nci_cidc_api_modules-1.1.31.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
-nci_cidc_api_modules-1.1.31.dist-info/RECORD,,
+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,,