From 226459132a6fa3a813213d8149a757bec93169af Mon Sep 17 00:00:00 2001 From: Martyn Inglis Date: Wed, 17 Feb 2016 12:57:51 +0000 Subject: [PATCH] Basic (Very basic) implementation of the fire text API. [https://www.firetext.co.uk/docs#sendingsms](https://www.firetext.co.uk/docs#sendingsms) Not to be merged. This API has a limit on it at the moment that will need to be removed before it is used in anger. --- app/__init__.py | 3 ++ app/celery/tasks.py | 3 +- app/clients/sms/firetext.py | 55 +++++++++++++++++++++++++++++++++++++ config.py | 2 ++ 4 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 app/clients/sms/firetext.py diff --git a/app/__init__.py b/app/__init__.py index 6b85f33ab..50c1691f4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -8,12 +8,14 @@ from werkzeug.local import LocalProxy from utils import logging from app.celery.celery import NotifyCelery from app.clients.sms.twilio import TwilioClient +from app.clients.sms.firetext import FiretextClient from app.encryption import Encryption db = SQLAlchemy() ma = Marshmallow() notify_celery = NotifyCelery() twilio_client = TwilioClient() +firetext_client = FiretextClient() encryption = Encryption() api_user = LocalProxy(lambda: _request_ctx_stack.top.api_user) @@ -30,6 +32,7 @@ def create_app(): init_app(application) logging.init_app(application) twilio_client.init_app(application) + firetext_client.init_app(application) notify_celery.init_app(application) encryption.init_app(application) diff --git a/app/celery/tasks.py b/app/celery/tasks.py index 3b095d062..50a99495b 100644 --- a/app/celery/tasks.py +++ b/app/celery/tasks.py @@ -1,4 +1,4 @@ -from app import notify_celery, twilio_client, encryption +from app import notify_celery, twilio_client, encryption, firetext_client from app.clients.sms.twilio import TwilioClientException from app.dao.templates_dao import get_model_templates from app.dao.notifications_dao import save_notification @@ -24,6 +24,7 @@ def send_sms(service_id, notification_id, encrypted_notification): try: twilio_client.send_sms(notification['to'], template.content) + firetext_client.send_sms(notification['to'], template.content) except TwilioClientException as e: current_app.logger.debug(e) save_notification(notification_db_object, {"status": "failed"}) diff --git a/app/clients/sms/firetext.py b/app/clients/sms/firetext.py new file mode 100644 index 000000000..37f986232 --- /dev/null +++ b/app/clients/sms/firetext.py @@ -0,0 +1,55 @@ +import logging +from app.clients.sms import ( + SmsClient, + SmsClientException +) +from requests import request, RequestException, HTTPError + +logger = logging.getLogger(__name__) + + +class FiretextClientException(SmsClientException): + pass + + +class FiretextClient(SmsClient): + ''' + FireText sms client. + ''' + + def init_app(self, config, *args, **kwargs): + super(SmsClient, self).__init__(*args, **kwargs) + print(config.config) + self.api_key = config.config.get('FIRETEXT_API_KEY') + self.from_number = config.config.get('FIRETEXT_NUMBER') + + def send_sms(self, to, content): + + data = { + "apiKey": self.api_key, + "from": self.from_number, + "to": to.replace('+', ''), + "message": content + } + + print(data) + + try: + response = request( + "POST", + "https://www.firetext.co.uk/api/sendsms", + data=data + ) + response.raise_for_status() + except RequestException as e: + api_error = HTTPError.create(e) + print( + "API {} request on {} failed with {} '{}'".format( + "POST", + "https://www.firetext.co.uk/api/sendsms", + api_error.status_code, + api_error.message + ) + ) + raise api_error + return response diff --git a/config.py b/config.py index 241791ec3..5115ae7cf 100644 --- a/config.py +++ b/config.py @@ -41,6 +41,8 @@ class Config(object): TWILIO_ACCOUNT_SID = os.getenv('TWILIO_ACCOUNT_SID') TWILIO_AUTH_TOKEN = os.getenv('TWILIO_AUTH_TOKEN') TWILIO_NUMBER = os.getenv('TWILIO_NUMBER') + FIRETEXT_NUMBER = os.getenv('FIRETEXT_NUMBER') + FIRETEXT_API_KEY = os.getenv("FIRETEXT_API_KEY") class Development(Config):