Add Africa's talking adapter

healthtools/search/nurses.py

@@ -21,7 +21,7 @@ def get_nurses_from_nc_registry(query):
     nurses = {'hits': [], 'total': 0}
     try:
         response = requests.get(url)
-        if 'No results' in response.content:
+        if b'No results' in response.content:
             return nurses
 
         # make soup for parsing out of response and get the table

healthtools/settings.py

@@ -44,6 +44,8 @@
 SMS_MTECH_PASS = os.getenv('HTOOLS_SMS_MTECH_PASS')
 SMS_MTECH_SHORTCODE = os.getenv('HTOOLS_SMS_MTECH_SHORTCODE', '22495')
 
+SMS_AFRICASTALKING_USER = os.getenv('HTOOLS_SMS_AFRICASTALKING_USER')
+SMS_AFRICASTALKING_KEY = os.getenv('HTOOLS_SMS_AFRICASTALKING_KEY')
 
 # TGBOT: TElegram Bot
 TGBOT = {

healthtools/sms/__init__.py

@@ -1,13 +1,18 @@
 import logging
 
-from healthtools.sms import twilio, mtech
+from healthtools.sms import twilio, mtech, africastalking
 from healthtools.search import run_query
 
 log = logging.getLogger(__name__)
 
 
-def process_sms(args, adapter='mtech'):
-
+def process_sms(request, adapter='mtech'):
+    args = request.args
+    if adapter == "africastalking":
+        args = {
+            'phoneNumber': request.values.get('from'),
+            'message': request.values.get('text')
+        }
     msg = args.get('message')
     phone_no = args.get('phoneNumber')
 
@@ -52,6 +57,13 @@ def create_sms(result, doc_type):
             '5. Health Facility: HF KITALE'
         return response
 
+    if (doc_type == 'nurses'):
+        response += 'We found ' + str(result['total']) + ' matches:'
+        for hit in result['hits'][:3]:
+             response += '\n' + "{}. {}".format(str(result_count), hit['name'])
+             result_count += 1
+        return response
+
     # TODO: Figure out singular vs plural
     response += 'Here are the top 3 matches your query returned'
     for hit in result['hits'][:3]:

healthtools/sms/africastalking.py

@@ -0,0 +1,20 @@
+import logging
+from africastalking.AfricasTalkingGateway import (AfricasTalkingGateway, AfricasTalkingGatewayException)
+from flask import current_app
+
+log = logging.getLogger(__name__)
+
+def send_sms(msg, phone_no):
+    username =  current_app.config.get('SMS_AFRICASTALKING_USER')
+    apikey =  current_app.config.get('SMS_AFRICASTALKING_KEY')
+    to = phone_no
+    message = msg
+
+    results = ''
+    gateway = AfricasTalkingGateway(username, apikey)
+
+    try:
+        results = gateway.sendMessage(to, message)
+    except AfricasTalkingGatewayException as e:
+        log.error('Encountered an error while sending: %s' ,str(e))
+    return results

healthtools/views/sms.py

@@ -10,7 +10,7 @@
 @blueprint.route('/sms', methods=['GET', 'POST'])
 @blueprint.route('/sms/<adapter>', methods=['GET', 'POST'])
 def index(adapter='mtech'):
-    result = process_sms(request.args, adapter)
+    result = process_sms(request, adapter)
 
     # Error with process_sms (process_sms returns false result)
     if(not result):

requirements.txt

@@ -1,3 +1,4 @@
+AfricastalkingGateway==1.9
 beautifulsoup4==4.6.0
 bs4==0.0.1
 certifi==2017.7.27.1
@@ -10,11 +11,16 @@ idna==2.6
 itsdangerous==0.24
 Jinja2==2.9.6
 MarkupSafe==1.0
+nested-lookup==0.1.3
+prompt-toolkit==1.0.15
 PyJWT==1.5.3
+PySocks==1.6.7
 pytz==2017.2
 requests==2.18.4
 requests-aws4auth==0.9
 six==1.11.0
 twilio==6.6.3
 urllib3==1.22
+wcwidth==0.1.7
 Werkzeug==0.12.2
+wit==4.3.0

runtime.txt

@@ -1 +1 @@
-python-2.7.13
+python-3.6.2