nci-cidc-api-modules 1.1.21__py3-none-any.whl → 1.1.23__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- cidc_api/config/settings.py +2 -0
- cidc_api/shared/gcloud_client.py +2 -1
- {nci_cidc_api_modules-1.1.21.dist-info → nci_cidc_api_modules-1.1.23.dist-info}/METADATA +2 -2
- {nci_cidc_api_modules-1.1.21.dist-info → nci_cidc_api_modules-1.1.23.dist-info}/RECORD +7 -7
- {nci_cidc_api_modules-1.1.21.dist-info → nci_cidc_api_modules-1.1.23.dist-info}/WHEEL +1 -1
- {nci_cidc_api_modules-1.1.21.dist-info → nci_cidc_api_modules-1.1.23.dist-info}/licenses/LICENSE +0 -0
- {nci_cidc_api_modules-1.1.21.dist-info → nci_cidc_api_modules-1.1.23.dist-info}/top_level.txt +0 -0
cidc_api/config/settings.py
CHANGED
@@ -95,11 +95,13 @@ if not TESTING:
|
|
95
95
|
CSMS_TOKEN_URL = secret_manager.get(environ.get("CSMS_TOKEN_URL_ID"))
|
96
96
|
CSMS_CLIENT_SECRET = secret_manager.get(environ.get("CSMS_CLIENT_SECRET_ID"))
|
97
97
|
CSMS_CLIENT_ID = secret_manager.get(environ.get("CSMS_CLIENT_ID_ID"))
|
98
|
+
IS_EMAIL_ON = secret_manager.get(environ.get("IS_EMAIL_ON_ID"))
|
98
99
|
else:
|
99
100
|
CSMS_BASE_URL = environ.get("CSMS_BASE_URL")
|
100
101
|
CSMS_TOKEN_URL = environ.get("CSMS_TOKEN_URL")
|
101
102
|
CSMS_CLIENT_SECRET = environ.get("CSMS_CLIENT_SECRET")
|
102
103
|
CSMS_CLIENT_ID = environ.get("CSMS_CLIENT_ID")
|
104
|
+
IS_EMAIL_ON = environ.get("IS_EMAIL_ON")
|
103
105
|
|
104
106
|
|
105
107
|
# Accumulate all constants defined in this file in a single dictionary
|
cidc_api/shared/gcloud_client.py
CHANGED
@@ -53,6 +53,7 @@ from ..config.settings import (
|
|
53
53
|
GOOGLE_GRANT_DOWNLOAD_PERMISSIONS_TOPIC,
|
54
54
|
TESTING,
|
55
55
|
ENV,
|
56
|
+
IS_EMAIL_ON,
|
56
57
|
DEV_CFUNCTIONS_SERVER,
|
57
58
|
INACTIVE_USER_DAYS,
|
58
59
|
)
|
@@ -898,7 +899,7 @@ def send_email(to_emails: List[str], subject: str, html_content: str, **kw) -> N
|
|
898
899
|
`kw` are expected to be sendgrid json api style additional email parameters.
|
899
900
|
"""
|
900
901
|
# Don't actually send an email if this is a test
|
901
|
-
if TESTING or ENV == "dev":
|
902
|
+
if TESTING or ENV == "dev" or IS_EMAIL_ON.lower() == "false":
|
902
903
|
logger.info(f"Would send email with subject '{subject}' to {to_emails}")
|
903
904
|
return
|
904
905
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
Metadata-Version: 2.4
|
2
2
|
Name: nci_cidc_api_modules
|
3
|
-
Version: 1.1.
|
3
|
+
Version: 1.1.23
|
4
4
|
Summary: SQLAlchemy data models and configuration tools used in the NCI CIDC API
|
5
5
|
Home-page: https://github.com/NCI-CIDC/cidc-api-gae
|
6
6
|
License: MIT license
|
@@ -28,7 +28,7 @@ Requires-Dist: python-dotenv==0.10.3
|
|
28
28
|
Requires-Dist: requests==2.32.3
|
29
29
|
Requires-Dist: jinja2==3.1.6
|
30
30
|
Requires-Dist: certifi==2024.7.4
|
31
|
-
Requires-Dist: nci-cidc-schemas==0.27.
|
31
|
+
Requires-Dist: nci-cidc-schemas==0.27.15
|
32
32
|
Dynamic: description
|
33
33
|
Dynamic: description-content-type
|
34
34
|
Dynamic: home-page
|
@@ -2,7 +2,7 @@ cidc_api/config/__init__.py,sha256=5mX8GAPxUKV84iS-aGOoE-4m68LsOCGCDptXNdlgvj0,1
|
|
2
2
|
cidc_api/config/db.py,sha256=cyWhWtmXha4OsrwUf6ez8aKSfm7tPSmPDE9JVSBx3Fk,1935
|
3
3
|
cidc_api/config/logging.py,sha256=E-SdjOYTpfsml-YaBL7Mj2mUT60OTAHH2X6TdeJWasU,1038
|
4
4
|
cidc_api/config/secrets.py,sha256=jRFj7W43pWuPf9DZQLCKF7WPXf5cUv-BAaS3ASqhV_Q,1481
|
5
|
-
cidc_api/config/settings.py,sha256=
|
5
|
+
cidc_api/config/settings.py,sha256=fJQIaCfxsuooEi1pAO8FhHurN0BjP6FZKX8jl7uHGZM,4203
|
6
6
|
cidc_api/csms/__init__.py,sha256=eJkY6rWNOAUBmSd4G1_U6h7i472druKEtBdVmgFZVPg,20
|
7
7
|
cidc_api/csms/auth.py,sha256=VTfHlCym_hqVrHXv41Ku9RMAGN9BiNe7ui0o9KZCKtY,3185
|
8
8
|
cidc_api/models/__init__.py,sha256=bl445G8Zic9YbhZ8ZBni07wtBMhLJRMBA-JqjLxx2bw,66
|
@@ -16,11 +16,11 @@ cidc_api/models/files/facets.py,sha256=JqCmwcjYYSz7XK4bAokSE9i71C8t9EQ4Jtbv7npth
|
|
16
16
|
cidc_api/shared/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
17
17
|
cidc_api/shared/auth.py,sha256=PHqmVGkqDjbmUofytVFwD_9ssgUomESl3fFtFHPwZYQ,9062
|
18
18
|
cidc_api/shared/emails.py,sha256=GY-l0EkoVU_3hjV0g-xo7N9d1iyCdluyq_arftEPPe0,4989
|
19
|
-
cidc_api/shared/gcloud_client.py,sha256=
|
19
|
+
cidc_api/shared/gcloud_client.py,sha256=i4ZZLoDC_pEwKaMS8218uUJ0fsIi0DKwd-hzGHGQw7g,33139
|
20
20
|
cidc_api/shared/jose.py,sha256=-qzGzEDAlokEp9E7WtBtQkXyyfPWTYXlwYpCqVJWmqM,1830
|
21
21
|
cidc_api/shared/rest_utils.py,sha256=RwR30WOUAYCxL7V-i2totEyeriG30GbBDvBcpLXhM9w,6594
|
22
|
-
nci_cidc_api_modules-1.1.
|
23
|
-
nci_cidc_api_modules-1.1.
|
24
|
-
nci_cidc_api_modules-1.1.
|
25
|
-
nci_cidc_api_modules-1.1.
|
26
|
-
nci_cidc_api_modules-1.1.
|
22
|
+
nci_cidc_api_modules-1.1.23.dist-info/licenses/LICENSE,sha256=pNYWVTHaYonnmJyplmeAp7tQAjosmDpAWjb34jjv7Xs,1102
|
23
|
+
nci_cidc_api_modules-1.1.23.dist-info/METADATA,sha256=EK7XGGRZhWjMuxhFmGkIVW3TYHwFcyCxVzUcloo0EK4,41285
|
24
|
+
nci_cidc_api_modules-1.1.23.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
|
25
|
+
nci_cidc_api_modules-1.1.23.dist-info/top_level.txt,sha256=rNiRzL0lJGi5Q9tY9uSoMdTbJ-7u5c_D2E86KA94yRA,9
|
26
|
+
nci_cidc_api_modules-1.1.23.dist-info/RECORD,,
|
{nci_cidc_api_modules-1.1.21.dist-info → nci_cidc_api_modules-1.1.23.dist-info}/licenses/LICENSE
RENAMED
File without changes
|
{nci_cidc_api_modules-1.1.21.dist-info → nci_cidc_api_modules-1.1.23.dist-info}/top_level.txt
RENAMED
File without changes
|