From 1fe4e3afde262e51621d4b388dd28c5e8fd91354 Mon Sep 17 00:00:00 2001 From: Benjamin Date: Wed, 10 Jan 2024 18:15:02 +0800 Subject: [PATCH] Update Resend SDK and resend api url in configuration. (#1963) --- api/.env.example | 1 + api/config.py | 1 + api/extensions/ext_mail.py | 7 ++++++- api/requirements.txt | 2 +- docker/docker-compose.yaml | 2 ++ 5 files changed, 11 insertions(+), 2 deletions(-) diff --git a/api/.env.example b/api/.env.example index 4d8f6f0d04..18c449a48b 100644 --- a/api/.env.example +++ b/api/.env.example @@ -86,6 +86,7 @@ MULTIMODAL_SEND_IMAGE_FORMAT=base64 MAIL_TYPE= MAIL_DEFAULT_SEND_FROM=no-reply RESEND_API_KEY= +RESEND_API_URL=https://api.resend.com # Sentry configuration SENTRY_DSN= diff --git a/api/config.py b/api/config.py index a9bd9c1bf8..a7e969594b 100644 --- a/api/config.py +++ b/api/config.py @@ -219,6 +219,7 @@ class Config: self.MAIL_TYPE = get_env('MAIL_TYPE') self.MAIL_DEFAULT_SEND_FROM = get_env('MAIL_DEFAULT_SEND_FROM') self.RESEND_API_KEY = get_env('RESEND_API_KEY') + self.RESEND_API_URL = get_env('RESEND_API_URL') # ------------------------ # Workpace Configurations. diff --git a/api/extensions/ext_mail.py b/api/extensions/ext_mail.py index 21a186228e..51ebfdce56 100644 --- a/api/extensions/ext_mail.py +++ b/api/extensions/ext_mail.py @@ -21,7 +21,12 @@ class Mail: api_key = app.config.get('RESEND_API_KEY') if not api_key: raise ValueError('RESEND_API_KEY is not set') - + + api_url = app.config.get('RESEND_API_URL') + if not api_url: + raise ValueError('RESEND_API_URL is not set') + + resend.api_url = api_url resend.api_key = api_key self._client = resend.Emails else: diff --git a/api/requirements.txt b/api/requirements.txt index 0780ef3644..030c8f7072 100644 --- a/api/requirements.txt +++ b/api/requirements.txt @@ -34,7 +34,7 @@ openpyxl==3.1.2 chardet~=5.1.0 docx2txt==0.8 pypdfium2==4.16.0 -resend~=0.5.1 +resend~=0.7.0 pyjwt~=2.6.0 anthropic~=0.7.7 newspaper3k==0.2.8 diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 4cac082a26..45ef342793 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -111,6 +111,7 @@ services: MAIL_DEFAULT_SEND_FROM: 'YOUR EMAIL FROM (eg: no-reply )' # the api-key for resend (https://resend.com) RESEND_API_KEY: '' + RESEND_API_URL: https://api.resend.com # The DSN for Sentry error reporting. If not set, Sentry error reporting will be disabled. SENTRY_DSN: '' # The sample rate for Sentry events. Default: `1.0` @@ -191,6 +192,7 @@ services: MAIL_DEFAULT_SEND_FROM: 'YOUR EMAIL FROM (eg: no-reply )' # the api-key for resend (https://resend.com) RESEND_API_KEY: '' + RESEND_API_URL: https://api.resend.com depends_on: - db - redis