nci-cidc-api-modules 1.2.35__py3-none-any.whl → 1.2.36__py3-none-any.whl

cidc_api/models/models.py

@@ -35,7 +35,8 @@ __all__ = [
     "ADMIN_FILE_CATEGORIES",
     "FINAL_JOB_STATUS",
     "INGESTION_JOB_STATUSES",
-    "INGESTION_JOB_COLORS",
+    "ASSAY_JOB_COLORS",
+    "CLINICAL_JOB_COLORS",
 ]
 
 import hashlib
@@ -3436,7 +3437,7 @@ INGESTION_JOB_STATUSES = [
 ]
 
 # Business decision to pass hex codes from the backend though that should be done by the front end...
-INGESTION_JOB_COLORS = {
+CLINICAL_JOB_COLORS = {
     "DRAFT": "",
     "INITIAL SUBMISSION": "#ACCAD7",
     "VALIDATION REVIEW": "#DABE90",
@@ -3444,6 +3445,13 @@ INGESTION_JOB_COLORS = {
     "INGESTION": "#8FCEC7",
     "PUBLISHED": "#90D9E6",
 }
+ASSAY_JOB_COLORS = {
+    "INITIAL SUBMISSION": "#43807E",
+    "VALIDATION REVIEW": "#906F3F",
+    "REVISION SUBMISSION": "#95358A",
+    "INGESTION": "#542C88",
+    "PUBLISHED": "#1C81A0",
+}
 # TODO If have "CANCELLED" concept or other final status, add here
 FINAL_JOB_STATUS = ["PUBLISHED"]
 TRIAL_APPENDIX_A_CELL_THAT_ENDS_THE_HEADER = "Data Category"

cidc_api/shared/assay_handling.py

@@ -53,7 +53,7 @@ def prepare_assay_job(trial_id: str, assay_type: str, batch_id: str) -> tuple[st
 
     # Create or retrieve intake bucket corresponding to the trial
     intake_bucket = gcloud_client.create_intake_bucket(get_current_user().email, trial_id=trial_id)
-    gcs_path = f"{intake_bucket.name}/{trial_id}/{assay_type}"
+    gcs_path = f"{intake_bucket.name}/{assay_type}/{submission_id}"
 
     return submission_id, job_status, error_status, start_date, version, gcs_path
 

cidc_api/shared/auth.py

@@ -1,16 +1,14 @@
 from functools import wraps
 from typing import List
 
-from packaging import version
-
 from flask import g, request, current_app as app, Flask
+from packaging import version
 from werkzeug.exceptions import Unauthorized, BadRequest, PreconditionFailed
 
-from ..models import Users, UserSchema
-
 from ..config.logging import get_logger
-
+from ..models import Users, UserSchema
 from ..shared.jose import decode_id_token
+from ..telemetry import trace_
 
 logger = get_logger(__name__)
 
@@ -144,6 +142,7 @@ def get_current_user() -> Users:
 _user_schema = UserSchema()
 
 
+@trace_()
 def authenticate() -> Users:
     id_token = _extract_token()
     token_payload = decode_id_token(id_token)
@@ -172,6 +171,7 @@ def _extract_token() -> str:
 
 
 ### Authorization logic ###
+@trace_()
 def authorize(user: Users, allowed_roles: List[str], resource: str, method: str) -> bool:
     """Check if the current user is authorized to act on the current request's resource.
     Raises Unauthorized

cidc_api/shared/file_handling.py

@@ -10,10 +10,12 @@ from ..config.settings import GOOGLE_CLINICAL_DATA_BUCKET
 from ..models import PreprocessedFiles, TRIAL_APPENDIX_A_CELL_THAT_ENDS_THE_HEADER
 from ..shared.auth import get_current_user
 from ..shared.gcloud_client import upload_file_to_gcs, move_gcs_file
+from ..telemetry import trace_
 
 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
 ) -> PreprocessedFiles:
@@ -26,6 +28,7 @@ def set_current_file(
     return latest_file
 
 
+@trace_()
 def create_file(
     file: FileStorage,
     gcs_folder: str,

cidc_api/shared/gcloud_client.py

@@ -1,6 +1,6 @@
 """Utilities for interacting with the Google Cloud Platform APIs."""
 
-# pylint: disable=logging-fstring-interpolation,too-many-lines
+# pylint: disable=logging-fstring-interpolation,too-many-lines, broad-exception-raised
 
 import base64
 import datetime
@@ -634,6 +634,7 @@ def _build_trial_upload_prefixes(
     trial_set: Set[str] = set()
     upload_set: Set[str] = set()
     if not trial_id:
+        # import is here becasue of circular import
         from ..models.models import TrialMetadata
 
         trial_set = {str(t.trial_id) for t in session.query(TrialMetadata).add_columns(TrialMetadata.trial_id)}
@@ -940,7 +941,8 @@ def get_signed_url(
 
 def _encode_and_publish(content: str, topic: str) -> Future:
     """Convert `content` to bytes and publish it to `topic`."""
-    pubsub_publisher = pubsub.PublisherClient()
+    publisher_options = pubsub.types.PublisherOptions(enable_open_telemetry_tracing=ENV == "dev-int")
+    pubsub_publisher = pubsub.PublisherClient(publisher_options=publisher_options)
     topic = pubsub_publisher.topic_path(GOOGLE_CLOUD_PROJECT, topic)
     data = bytes(content, "utf-8")
 

cidc_api/shared/utils.py

@@ -1,11 +1,19 @@
-def strip_whitespaces(df):
-    def stripper(x):
-        if x and isinstance(x, str):
-            return x.strip()
-        else:
-            return x
-
-    df.rename(columns=stripper, inplace=True)
-    df = df.map(stripper)
+from cidc_api.telemetry import trace_
+
+
+def _stripper(x):
+    if x and isinstance(x, str):
+        return x.strip()
+    else:
+        return x
+
+
+@trace_("sheet")
+def strip_whitespaces(df, sheet=None):
+    if sheet:
+        df = df[sheet]
+
+    df.rename(columns=_stripper, inplace=True)
+    df = df.map(_stripper)
 
     return df

{nci_cidc_api_modules-1.2.35.dist-info → nci_cidc_api_modules-1.2.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nci_cidc_api_modules
-Version: 1.2.35
+Version: 1.2.36
 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
@@ -33,6 +33,14 @@ Requires-Dist: requests>=2.32.5
 Requires-Dist: sqlalchemy>=2.0.44
 Requires-Dist: sqlalchemy-mixins~=2.0.5
 Requires-Dist: werkzeug>=3.1.4
+Requires-Dist: opentelemetry-api>=1.38.0
+Requires-Dist: opentelemetry-exporter-otlp-proto-grpc>=1.38.0
+Requires-Dist: opentelemetry-sdk>=1.38.0
+Requires-Dist: opentelemetry-instrumentation-flask>=0.59b0
+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
 Dynamic: description
 Dynamic: description-content-type

{nci_cidc_api_modules-1.2.35.dist-info → nci_cidc_api_modules-1.2.36.dist-info}/RECORD

@@ -6,7 +6,7 @@ cidc_api/config/settings.py,sha256=ttOGvk_6zVMn4dtxIZ2-0w3wF2fpAUVfGpVZbKJ2b6s,4
 cidc_api/models/__init__.py,sha256=cTyK0Z1ttLo9itwZVRFr-d6aX-zX633YhqipqPgoGfE,115
 cidc_api/models/data.py,sha256=uLkgAJ6tCtsi3bOGt8I9esYrZqgbsTYM1rGfL2gx5sY,837
 cidc_api/models/migrations.py,sha256=UlS5How3J4ryaRuZT6F5VQtAKikkl0LTv9MgMO_ltiQ,11161
-cidc_api/models/models.py,sha256=HFy3_CheDe_tfVCQkC88BMdi9C27tnd_H-MGvYqUv44,152709
+cidc_api/models/models.py,sha256=QLVxftl9vEgHEPA5au0lh2usTTsh5lI8vWjuS2Twxdk,152921
 cidc_api/models/schemas.py,sha256=6IE2dJoEMcMbi0Vr1V3cYKnPKU0hv9vRKBixOZHe88s,2766
 cidc_api/models/types.py,sha256=nq_PvzDz67HzceOI_ve9AxReExAZ-XFE7T3G2bbpqJ4,29667
 cidc_api/models/db/base_orm.py,sha256=EV78qFBcOR7spK_PhjbkpsGcmcP33AQItX61SidDa_8,813
@@ -94,17 +94,17 @@ cidc_api/reference/icd10cm.py,sha256=K1vbTQB75uAQeKgj0U9izhtMKVb2vqp69_hyx3z_jro
 cidc_api/reference/icdo3.py,sha256=A19yNX5-9Gs3X83kXcTlGgsXDTTJ9yR2dxEIoBVmpmU,296
 cidc_api/reference/uberon.py,sha256=BO2mYNDvPzZyLdhL_ZjCyEgHSLHuVifnTJvfktUfVWA,148
 cidc_api/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cidc_api/shared/assay_handling.py,sha256=kjxPGt4Dw-EkHGHfce32EXAPvWoPfPNFQCTso4Z0ez4,2892
-cidc_api/shared/auth.py,sha256=PHqmVGkqDjbmUofytVFwD_9ssgUomESl3fFtFHPwZYQ,9062
+cidc_api/shared/assay_handling.py,sha256=zzWSqQ-ddLVzX5IuHvsaSib2H1lnjXpo9LbxaoqaHHs,2897
+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=UP3KZ61Km5RNmNfk126_upKv-jGkDzpc5Pvk1s7cU2Q,5585
-cidc_api/shared/gcloud_client.py,sha256=SI8fcKAavLlIsU_5XMKe4ebjYkl-qantX07zihsgkaU,38140
+cidc_api/shared/file_handling.py,sha256=ahzVZnhg23DloaopKVvCzgw_vHc6c8vxxZdAKR38sjI,5636
+cidc_api/shared/gcloud_client.py,sha256=fDNgRpU7jAeDtYfY-Zz09KE-__jHo6v0J7fI3eLgyhM,38353
 cidc_api/shared/jose.py,sha256=-qzGzEDAlokEp9E7WtBtQkXyyfPWTYXlwYpCqVJWmqM,1830
 cidc_api/shared/rest_utils.py,sha256=RwR30WOUAYCxL7V-i2totEyeriG30GbBDvBcpLXhM9w,6594
-cidc_api/shared/utils.py,sha256=FdZJiynmh6BIzWyCTcUAcUMKCAtzEyp_HLdXEticNcI,237
-nci_cidc_api_modules-1.2.35.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
-nci_cidc_api_modules-1.2.35.dist-info/METADATA,sha256=r7t33YqkP9xxzOGvJ_9auttusdTNOU3gdsre1qpl7t4,39792
-nci_cidc_api_modules-1.2.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nci_cidc_api_modules-1.2.35.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
-nci_cidc_api_modules-1.2.35.dist-info/RECORD,,
+cidc_api/shared/utils.py,sha256=Po14K_7cvMKI9zJVzS0YDP1IqDBQS5Mvs6UMvS0RT4g,328
+nci_cidc_api_modules-1.2.36.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
+nci_cidc_api_modules-1.2.36.dist-info/METADATA,sha256=94lsTOKAtCJgZoANklikdDqfp-R7UQoU2qCOobI2sHI,40229
+nci_cidc_api_modules-1.2.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nci_cidc_api_modules-1.2.36.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
+nci_cidc_api_modules-1.2.36.dist-info/RECORD,,