nci-cidc-api-modules 1.2.42__py3-none-any.whl → 1.2.43__py3-none-any.whl

cidc_api/__init__.py

@@ -1 +1 @@
-__version__ = "1.2.42"
+__version__ = "1.2.43"

cidc_api/models/files/facets.py

@@ -376,6 +376,10 @@ assay_facets: Facets = {
         "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"]),
     },
+    "TCRseq RNA": {
+        "Alpha Results": FacetConfig(["/tcrseq_rna/alpha.csv"]),
+        "Beta Results": FacetConfig(["/tcrseq_rna/beta.csv"]),
+    },
     "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"),

cidc_api/models/models.py

@@ -28,6 +28,7 @@ __all__ = [
     "JobFileCategories",
     "CategoryDataElements",
     "ValidationConfigs",
+    "MASTER_APPENDIX_A",
     "TRIAL_APPENDIX_A",
     "TRIAL_APPENDIX_A_CELL_THAT_ENDS_THE_HEADER",
     "REQUEST_LETTER",
@@ -3262,6 +3263,7 @@ def upload_manifest_json(
     return manifest_upload.id
 
 
+MASTER_APPENDIX_A = "master_appendix_a"
 TRIAL_APPENDIX_A = "trial_appendix_a"
 REQUEST_LETTER = "request_letter"
 DETAILED_VALIDATION = "detailed_validation"
@@ -3361,6 +3363,16 @@ class PreprocessedFiles(CommonColumns):
         query = cls.add_job_filter(query, job_id)
         return query.all()
 
+    @classmethod
+    @with_default_session
+    def get_latest_current_file(
+        cls, file_category: str, job_id: int = None, session: Session = None
+    ) -> Optional["PreprocessedFiles"]:
+        """Return the latest 'current' file for the given category and job_id. Returns None if no file exists."""
+        query = session.query(cls).filter_by(file_category=file_category, status="current")
+        query = cls.add_job_filter(query, job_id)
+        return query.order_by(cls.version.desc()).first()
+
     @classmethod
     @with_default_session
     def get_file_by_category_and_version(

cidc_api/models/types.py

@@ -113,6 +113,7 @@ AssayType = Literal[
     "snRNA-Seq",
     "Visium",
     "Olink HT",
+    "TCRseq RNA",
 ]
 
 

cidc_api/shared/file_handling.py

@@ -17,14 +17,22 @@ logger = get_logger(__name__)
 
 @trace_()
 def set_current_file(
-    file: FileStorage, file_category: str, gcs_folder: str, session: Session, uploader_email: str, job_id: int = None
+    file: FileStorage,
+    file_category: str,
+    gcs_folder: str,
+    session: Session,
+    uploader_email: str,
+    job_id: int = None,
+    append_timestamp: bool = None,
 ) -> PreprocessedFiles:
     """
     Archives any existing 'current' files for the given category and job,
     then uploads the new file as the latest 'current' version.
     """
     latest_version = PreprocessedFiles.archive_current_files(file_category, job_id=job_id, session=session)
-    latest_file = create_file(file, gcs_folder, file_category, session, uploader_email, job_id, latest_version + 1)
+    latest_file = create_file(
+        file, gcs_folder, file_category, session, uploader_email, job_id, latest_version + 1, append_timestamp
+    )
     return latest_file
 
 
@@ -37,11 +45,12 @@ def create_file(
     uploader_email: str,
     job_id: int = None,
     version: int = None,
+    append_timestamp: bool = None,
 ) -> PreprocessedFiles:
     """Upload file to GCS and create corresponding metadata record in the database."""
     status = "pending" if gcs_folder.endswith("pending/") else "current"
-    # only need timestamp for current/versioned files
-    append_timestamp = status == "current"
+    # only need timestamp for current/versioned files, if not specified otherwise
+    append_timestamp = append_timestamp if append_timestamp is not None else (status == "current")
     # create file in GCS
     gcs_file_path = upload_file_to_gcs(file, GOOGLE_CLINICAL_DATA_BUCKET, gcs_folder, append_timestamp=append_timestamp)
     # create corresponding record in db

cidc_api/shared/gcloud_client.py

@@ -907,6 +907,7 @@ def get_signed_url(
     bucket_name: str = GOOGLE_ACL_DATA_BUCKET,
     method: str = "GET",
     expiry_mins: int = 30,
+    use_short_filename: bool = False,
 ) -> str:
     """
     Generate a signed URL for `object_name` to give a client temporary access.
@@ -921,7 +922,11 @@ def get_signed_url(
 
     # Generate the signed URL, allowing a client to use `method` for `expiry_mins` minutes
     expiration = datetime.timedelta(minutes=expiry_mins)
-    full_filename = object_name.replace("/", "_").replace('"', "_").replace(" ", "_")
+    if use_short_filename:
+        filename = os.path.basename(object_name)
+    else:
+        # full filename with path included
+        filename = object_name.replace("/", "_").replace('"', "_").replace(" ", "_")
     other_kwargs = {}
     if os.environ.get("DEV_GOOGLE_STORAGE", None):
         other_kwargs["api_access_endpoint"] = (os.environ.get("DEV_GOOGLE_STORAGE") or "") + (
@@ -931,7 +936,7 @@ def get_signed_url(
         version="v2",
         expiration=expiration,
         method=method,
-        response_disposition=f'attachment; filename="{full_filename}"',
+        response_disposition=f'attachment; filename="{filename}"',
         **other_kwargs,
     )
     logger.info(f"generated signed URL for {object_name}: {url}")

{nci_cidc_api_modules-1.2.42.dist-info → nci_cidc_api_modules-1.2.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.42
+Version: 1.2.43
 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
@@ -41,7 +41,7 @@ Requires-Dist: opentelemetry-instrumentation-requests>=0.59b0
 Requires-Dist: opentelemetry-instrumentation-sqlalchemy>=0.59b0
 Requires-Dist: opentelemetry-exporter-gcp-trace>=1.11.0
 Requires-Dist: opentelemetry-propagator-gcp>=1.11.0
-Requires-Dist: nci-cidc-schemas==0.28.10
+Requires-Dist: nci-cidc-schemas==0.28.11
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page

{nci_cidc_api_modules-1.2.42.dist-info → nci_cidc_api_modules-1.2.43.dist-info}/RECORD

@@ -1,4 +1,4 @@
-cidc_api/__init__.py,sha256=Ng7mLXI95GEYWOWi3HpHuVabVYSs3igDIcqorkuDZds,23
+cidc_api/__init__.py,sha256=cQdKSyCwNmNJIc8_WJGeQUnEEs6ocLSyIpRm10uJ9OU,23
 cidc_api/telemetry.py,sha256=LuZWkG8CKCn23O41RTNxEOQwMmfpp-fQ6zSInZhVJg8,3333
 cidc_api/config/__init__.py,sha256=5mX8GAPxUKV84iS-aGOoE-4m68LsOCGCDptXNdlgvj0,148
 cidc_api/config/db.py,sha256=mEz8ugjvRNGylCqDYHaaMqaZfDh7sbd76BowmfBvq5c,2428
@@ -8,9 +8,9 @@ cidc_api/config/settings.py,sha256=ttOGvk_6zVMn4dtxIZ2-0w3wF2fpAUVfGpVZbKJ2b6s,4
 cidc_api/models/__init__.py,sha256=bl445G8Zic9YbhZ8ZBni07wtBMhLJRMBA-JqjLxx2bw,66
 cidc_api/models/data.py,sha256=mySTpsG4qEBSh5c7dpQZJ2xTxHiYdFYuXO_a_B2gPXE,1313
 cidc_api/models/migrations.py,sha256=UlS5How3J4ryaRuZT6F5VQtAKikkl0LTv9MgMO_ltiQ,11161
-cidc_api/models/models.py,sha256=h8AvXuxXYuekCwPhiEpYbVGG7jHQog3wnWiEXLIaXdY,153111
+cidc_api/models/models.py,sha256=DTt0eFkFVVxVn23Aqr6TA8CQ7qb2hdqQ0xVJ3RakBBw,153684
 cidc_api/models/schemas.py,sha256=6IE2dJoEMcMbi0Vr1V3cYKnPKU0hv9vRKBixOZHe88s,2766
-cidc_api/models/types.py,sha256=Zv9eUs7XUysJa_lzimbl7jSOEhvNozAkgPGGbvMIafo,30040
+cidc_api/models/types.py,sha256=WVOTEH61FH5aGVwRbEcfNOce8NLjiEnl1ixtPWav2OA,30058
 cidc_api/models/db/stage1/__init__.py,sha256=zsxOSoogzL_xZ8B5OwcwLXvAmm6g2GYx1Zf6LLw8dq8,1917
 cidc_api/models/db/stage1/additional_treatment_orm.py,sha256=aiimE27oj96sE4F9LwZAlkHNLMwH8dNS5GTYA4DnSIU,968
 cidc_api/models/db/stage1/adverse_event_orm.py,sha256=dgFdFQliPMzoYa5yf8TlX0XM1tcyu4zfu9Xq8Hbmzwc,1956
@@ -78,7 +78,7 @@ cidc_api/models/db/stage2/treatment_orm.py,sha256=xGgLSzIgoWpNylnCZAWQ2NElHCGKFm
 cidc_api/models/db/stage2/trial_orm.py,sha256=OPUwv9lm8zLHvQYJ-XPtNqsppwn8IYXAyuyGoYhlpB4,2897
 cidc_api/models/files/__init__.py,sha256=8BMTnUSHzUbz0lBeEQY6NvApxDD3GMWMduoVMos2g4Y,213
 cidc_api/models/files/details.py,sha256=sZkGM7iEV4-J6IDQCdiMV6KBDLbPxCOqUMaU3aY9rX8,65153
-cidc_api/models/files/facets.py,sha256=rG99wUpHvWHkcRDxTcXz40502Er47l_5hKzP-ORvXGE,33621
+cidc_api/models/files/facets.py,sha256=vieZ3z_tYB29NqtvNzvKqajVwxM5ZLLZKeyQTq5lheU,33776
 cidc_api/models/pydantic/base.py,sha256=6Lsf4fekIS1E-DwZmgCXlfm3Qq9_23dA_v3iz1w2JoA,1427
 cidc_api/models/pydantic/stage1/__init__.py,sha256=H-NDjCd8isHTgZ7sqz-MIbzC-PpW1kEtR-x-Dyc8r6Q,1667
 cidc_api/models/pydantic/stage1/additional_treatment.py,sha256=TFVzjd1NPLSfH9UnL2W3aZhpZSzDsg97j9IK8t882YA,1050
@@ -153,13 +153,13 @@ cidc_api/shared/assay_handling.py,sha256=zzWSqQ-ddLVzX5IuHvsaSib2H1lnjXpo9Lbxaoq
 cidc_api/shared/auth.py,sha256=EIP9AKokLNrI79Fkpv3P7WdzaddJIsuGGICc1W494X0,9110
 cidc_api/shared/email_layout.html,sha256=pBoTNw3ACHH-ncZFaNvcy5bXMqPwizR78usb0uCYtIc,7670
 cidc_api/shared/emails.py,sha256=8kNFEaSnKpY-GX_iE59QUhSp3c4_uzy3SpHYt2QjuqI,6121
-cidc_api/shared/file_handling.py,sha256=ahzVZnhg23DloaopKVvCzgw_vHc6c8vxxZdAKR38sjI,5636
-cidc_api/shared/gcloud_client.py,sha256=l40qQ0lo2QQkWfarXlApmI7iPeYzYoEEXBvemyizYnc,38421
+cidc_api/shared/file_handling.py,sha256=ObsLvBrkwHo6Nv48GvFXDKElNNl4inGpxv--001H_xc,5843
+cidc_api/shared/gcloud_client.py,sha256=flRIot4wt__JOkn_DP6XE8YW--t-30K7P8TMgB0UGUs,38582
 cidc_api/shared/jose.py,sha256=-qzGzEDAlokEp9E7WtBtQkXyyfPWTYXlwYpCqVJWmqM,1830
 cidc_api/shared/rest_utils.py,sha256=RwR30WOUAYCxL7V-i2totEyeriG30GbBDvBcpLXhM9w,6594
 cidc_api/shared/utils.py,sha256=-gLnzxCR9E6h0plt2xrNisUG5_Y6GhhVwz3DgDIzpvs,367
-nci_cidc_api_modules-1.2.42.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
-nci_cidc_api_modules-1.2.42.dist-info/METADATA,sha256=SroeJFGQ9eCHO-1d02bhZXpVul_6QIYn1t7s_Df4ySI,40229
-nci_cidc_api_modules-1.2.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nci_cidc_api_modules-1.2.42.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
-nci_cidc_api_modules-1.2.42.dist-info/RECORD,,
+nci_cidc_api_modules-1.2.43.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
+nci_cidc_api_modules-1.2.43.dist-info/METADATA,sha256=oSYq0wyk9VSMtXGmLql3apEZK2Fw4X8_gHbblXdSM4g,40229
+nci_cidc_api_modules-1.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nci_cidc_api_modules-1.2.43.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
+nci_cidc_api_modules-1.2.43.dist-info/RECORD,,