nci-cidc-api-modules 1.1.14__py3-none-any.whl → 1.1.16__py3-none-any.whl

cidc_api/shared/emails.py

@@ -1,14 +1,11 @@
 """Template functions for CIDC email bodies."""
 
 import html
-import base64
 from functools import wraps
-from typing import Dict, Union
-
-from cidc_schemas.prism import generate_analysis_configs_from_upload_patch
+from typing import List
 
 from . import gcloud_client
-from ..config.settings import ENV, GOOGLE_ACL_DATA_BUCKET
+from ..config.settings import ENV
 
 # emails this list for
 # - new user registration,
@@ -87,14 +84,12 @@ def new_user_registration(email: str) -> dict:
 @sendable
 def new_upload_alert(upload, full_metadata) -> dict:
     """Alert the CIDC administrators that an upload succeeded."""
-    pipeline_configs: Dict[str, Union[bytes, str]] = generate_analysis_configs_from_upload_patch(
-        full_metadata,
-        upload.metadata_patch,
-        upload.upload_type,
-        GOOGLE_ACL_DATA_BUCKET,
-    )
+    possible_manifest_info = ""
+    if upload.metadata_patch and "shipments" in upload.metadata_patch and upload.metadata_patch["shipments"]:
+        manifest_id = upload.metadata_patch["shipments"][0].get("manifest_id")
+        possible_manifest_info = f" manifest {manifest_id}"
 
-    subject = f"[UPLOAD SUCCESS]({ENV}) {upload.upload_type} uploaded to {upload.trial_id}"
+    subject = f"[UPLOAD SUCCESS]({ENV}) {upload.upload_type}{possible_manifest_info} uploaded to {upload.trial_id}"
 
     html_content = f"""
     <ul>
@@ -137,3 +132,21 @@ def intake_metadata(user, trial_id: str, assay_type: str, description: str, xlsx
     }
 
     return email
+
+
+def notify_manifest_errors(subject_message: str, errors: List[str], send_email=True) -> dict:
+    """Alert the CIDC administrators of errors in an attempted upload."""
+    subject = f"[UPLOAD FAILURE]({ENV}) {subject_message}"
+    html_content = f"<ul>{''.join(f'<li>{error}</li>' for error in errors)}</ul>"
+    return notify_mailing_list(subject, html_content, send_email=send_email)
+
+
+@sendable
+def notify_mailing_list(subject: str, html_content: str) -> dict:
+    """Generic notification to the CIDC administrators based on info passed."""
+    email = {
+        "to_emails": CIDC_MAILING_LIST,
+        "subject": subject,
+        "html_content": html_content,
+    }
+    return email

{nci_cidc_api_modules-1.1.14.dist-info → nci_cidc_api_modules-1.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.1.14
+Version: 1.1.16
 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
@@ -26,7 +26,7 @@ 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: jinja2==3.1.5
+Requires-Dist: jinja2==3.1.6
 Requires-Dist: certifi==2024.7.4
 Requires-Dist: nci-cidc-schemas==0.27.09
 Dynamic: description

{nci_cidc_api_modules-1.1.14.dist-info → nci_cidc_api_modules-1.1.16.dist-info}/RECORD

@@ -15,12 +15,12 @@ cidc_api/models/files/details.py,sha256=v4v_BetAOBiEq-FVcxho8lamZCRGb48oAvKk9yq4
 cidc_api/models/files/facets.py,sha256=803siMWziH5UVaF2tj49a_kJYb6CmSWHsGQJweXwyJY,28705
 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=MG2csNhMaw3WtbUEqjMxhzV3X1pMzC8RGYBfNy_X0nc,4334
+cidc_api/shared/emails.py,sha256=GY-l0EkoVU_3hjV0g-xo7N9d1iyCdluyq_arftEPPe0,4989
 cidc_api/shared/gcloud_client.py,sha256=spgH0fapO713X82eV23uLXtq4aVWJHwEDK-XDxaehJc,33088
 cidc_api/shared/jose.py,sha256=-qzGzEDAlokEp9E7WtBtQkXyyfPWTYXlwYpCqVJWmqM,1830
 cidc_api/shared/rest_utils.py,sha256=RwR30WOUAYCxL7V-i2totEyeriG30GbBDvBcpLXhM9w,6594
-nci_cidc_api_modules-1.1.14.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
-nci_cidc_api_modules-1.1.14.dist-info/METADATA,sha256=RnTkbnCcd4OQLW8LiEAZupmH60EmbAgJdnOBE6u_s_0,41284
-nci_cidc_api_modules-1.1.14.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nci_cidc_api_modules-1.1.14.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
-nci_cidc_api_modules-1.1.14.dist-info/RECORD,,
+nci_cidc_api_modules-1.1.16.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
+nci_cidc_api_modules-1.1.16.dist-info/METADATA,sha256=yo19-nBqPHrZoxHLujzKkP4AM8P2daE8aoKlxtgW-zk,41284
+nci_cidc_api_modules-1.1.16.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+nci_cidc_api_modules-1.1.16.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
+nci_cidc_api_modules-1.1.16.dist-info/RECORD,,

{nci_cidc_api_modules-1.1.14.dist-info → nci_cidc_api_modules-1.1.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any