Slight changes.

Author: DavidLemayian

README.md

@@ -30,17 +30,17 @@ Install Memcached
 
 You can set the required environment variables like so
 ```<>
+$ export APP_DEBUG=<False> # True or False
 $ export MEMCACHED_URL=<memcache_url:port> # defaults to 127.0.0.1:8000
 $ export GA_TRACKING_ID=<google-analytics-tracking-id>
 $ export SMS_USER=<sms-provider-user-id>
 $ export SMS_PASS=<sms-provider-passcode>
 $ export SMS_SHORTCODE=<sms-provider-shortcode>
 $ export SMS_SEND_URL=<url-for-sms-provider>
-$ export CONFIG=<config-mode>  # eg. "healthtools_ke_api.settings.DevConfig"
-$ export AWS_ACCESS_KEY_ID=<aws-access-key-id>
+$ export AWS_ACCESS_KEY=<aws-access-key-id>
 $ export AWS_SECRET_KEY=<aws-secret-key>
-$ export AWS_REGION=<aws-region>
 $ export ES_HOST=<elasticsearch_host_endpoint> (DO NOT SET THIS IF YOU WOULD LIKE TO USE ELASTIC SEARCH LOCALLY ON YOUR MACHINE)
+$export ES_PORT=<elasticsearch_port>
 ```
 **If you want to use elasticsearch locally on your machine use the following instructions to set it up**
 
@@ -63,4 +63,4 @@ Run memcached on your terminal `$ memcached -p <port you set MEMCACHED_URL to ru
 _**make sure if you use elasticsearch locally, it's running**_
 
 Use nosetests to run tests (with stdout) like this:
-```$ nosetests --nocapture```
+```$ nosetests --nocapture```

healthtools_ke_api/__init__.py

@@ -13,12 +13,6 @@
 
 app = Flask(__name__)
 
-try:
-    app.config.from_object(os.getenv('CONFIG'))
-except KeyError:
-    print "No config has been specified for use in the environment variables."
-    sys.exit()
-
 app.register_blueprint(doctors_api, url_prefix='/doctors')
 app.register_blueprint(nurses_api, url_prefix='/nurses')
 app.register_blueprint(clinical_officers_api, url_prefix='/clinical-officers')

healthtools_ke_api/analytics.py

@@ -24,7 +24,7 @@ def track_event(tracking_id, category, action, cid, label=None, value=0):
         'ea': action,
         'el': label,
         'ev': value,
-        }
+    }
     response = requests.post(
         'http://www.google-analytics.com/collect', data=data)
     response.raise_for_status()

healthtools_ke_api/settings.py

@@ -1,40 +1,28 @@
 import os
 
+DEBUG = os.getenv("APP_DEBUG", False)
+
 # Url of memcached server
-MEMCACHED_URL = os.getenv("MEMCACHED_URL", '127.0.0.1:8000')
+MEMCACHED_URL = os.getenv("MEMCACHED_URL", "127.0.0.1:11211")
 
 # Amazon Web Services configs
-AWS_CONFIGS = {
-    "aws_access_key_id": os.getenv("AWS_ACCESS_KEY_ID"),
-    "aws_secret_access_key": os.getenv("AWS_SECRET_KEY"),
-    "region_name": os.getenv("AWS_REGION", 'eu-west-1'),
-    }
+AWS = {
+    "access_key": os.getenv("AWS_ACCESS_KEY"),
+    "secret_key": os.getenv("AWS_SECRET_KEY"),
+    "region": os.getenv("AWS_REGION", "eu-west-1"),
+}
 
 # Elastic Search configs
 ES = {
     "host": os.getenv("ES_HOST", "127.0.0.1"),
     "port": os.getenv("ES_PORT", "9200"),
-    "index": "healthtools"
-    }
-
-
-class Config(object):
-    # Google Analytics tracking id
-    GA_TRACKING_ID = os.environ.get('GA_TRACKING_ID')
-
-    # SMS provider credentials
-    SMS_USER = os.environ.get('SMS_USER')
-    SMS_PASS = os.environ.get('SMS_PASS')
-    SMS_SHORTCODE = os.environ.get('SMS_SHORTCODE')
-
-    DOCTORS_SEARCH_URL = "https://6ujyvhcwe6.execute-api.eu-west-1.amazonaws.com/prod"
-    NURSE_SEARCH_URL = "https://api.healthtools.codeforafrica.org/nurses/search.json"
-    CO_SEARCH_URL = "https://vfblk3b8eh.execute-api.eu-west-1.amazonaws.com/prod"
-    NHIF_SEARCH_URL = "https://t875kgqahj.execute-api.eu-west-1.amazonaws.com/prod"
-    HF_SEARCH_URL = "https://187mzjvmpd.execute-api.eu-west-1.amazonaws.com/prod"
+    "index": "healthtools-ke"
+}
 
+# Google Analytics tracking id
+GA_TRACKING_ID = os.environ.get('GA_TRACKING_ID')
 
-# development config
-class DevConfig(Config):
-    DEBUG = True
-    SERVER_NAME = "127.0.0.1:8000"
+# SMS provider credentials
+SMS_USER = os.environ.get('SMS_USER')
+SMS_PASS = os.environ.get('SMS_PASS')
+SMS_SHORTCODE = os.environ.get('SMS_SHORTCODE')

healthtools_ke_api/views/clinical_officers.py

@@ -15,15 +15,17 @@ def index():
         "name": "API to Kenyan Clinical Officers registry",
         "authentication": [],
         "endpoints": {
-            "/": {"methods": ["GET"]},
+            "/": {
+                "methods": ["GET"]
+            },
             "/clinical-officers/search.json": {
                 "methods": ["GET"],
                 "args": {
                     "q": {"required": True}
-                    }
-                },
-            }
+                }
+            },
         }
+    }
     return jsonify(msg)
 
 
@@ -36,7 +38,7 @@ def search():
                 "error": "A query is required.",
                 "results": "",
                 "data": {"clinical_officers": []}
-                })
+            })
 
         # get clinical_officers by that name from aws
         response = {}
@@ -59,4 +61,4 @@ def search():
             "status": "error",
             "message": str(err),
             "data": {"clinical_officers": []}
-            })
+        })

healthtools_ke_api/views/doctors.py

@@ -20,10 +20,10 @@ def index():
                 "methods": ["GET"],
                 "args": {
                     "q": {"required": True}
-                    }
-                },
-            }
+                }
+            },
         }
+    }
     return jsonify(msg)
 
 
@@ -36,7 +36,7 @@ def search():
                 "error": "A query is required.",
                 "results": "",
                 "data": {"doctors": []}
-                })
+            })
 
         # get doctors by that name from aws
         response = {}
@@ -58,4 +58,4 @@ def search():
             "status": "error",
             "message": str(err),
             "data": {"doctors": []}
-            })
+        })

healthtools_ke_api/views/elastic_search.py

@@ -1,30 +1,31 @@
 from elasticsearch import Elasticsearch, RequestsHttpConnection
 from requests_aws4auth import AWS4Auth
 
-from healthtools_ke_api.settings import AWS_CONFIGS as AWS, ES
+from healthtools_ke_api.settings import AWS, ES
 from serializer import JSONSerializerPython2
 import re
 
+
 class Elastic(object):
     """
     Common class for elastic search client and methods
     """
     def __init__(self):
         # client host for aws elastic search service
-        if 'aws' in ES['host']:
+        if "aws" in ES["host"]:
             # set up authentication credentials
-            awsauth = AWS4Auth(AWS["aws_access_key_id"], AWS["aws_secret_access_key"], AWS["region_name"], 'es')
+            awsauth = AWS4Auth(AWS["access_key"], AWS["secret_key"], AWS["region"], 'es')
             self.es_client = Elasticsearch(
-                hosts=ES['host'],
-                port=ES['port'],
+                hosts=ES["host"],
+                port=int(ES["port"]),
                 http_auth=awsauth,
                 use_ssl=True,
                 verify_certs=True,
                 connection_class=RequestsHttpConnection,
                 serializer=JSONSerializerPython2()
-                )
+            )
         else:
-            self.es_client = Elasticsearch("{}:{}".format(ES['host'], ES['port']))
+            self.es_client = Elasticsearch("{}:{}".format(ES["host"], ES["port"]))
 
     @staticmethod
     def remove_keyword(query):
@@ -54,9 +55,9 @@ def get_from_elasticsearch(self, doc_type, query):
                             "query": search_term,
                             "fuzziness": "auto",
                             "prefix_length": 1
-                            }
                         }
                     }
                 }
-            )
+            }
+        )
         return results["hits"]["hits"]

healthtools_ke_api/views/nurses.py

@@ -28,10 +28,10 @@ def index():
                 "methods": ["GET"],
                 "args": {
                     "q": {"required": True}
-                    }
-                },
-            }
+                }
+            },
         }
+    }
     return jsonify(msg)
 
 
@@ -81,7 +81,7 @@ def search():
             "status": "error",
             "message": str(err),
             "data": {"nurses": []}
-            })
+        })
 
 
 def get_nurses_from_nc_registry(query):
@@ -97,7 +97,7 @@ def get_nurses_from_nc_registry(query):
 
     # make soup for parsing out of response and get the table
     soup = BeautifulSoup(response.content, "html.parser")
-    table = soup.find('table', {"class": "zebra"}).find("tbody")
+    table = soup.find("table", {"class": "zebra"}).find("tbody")
     rows = table.find_all("tr")
 
     # parse table for the nurses data

healthtools_ke_api/views/sms_handler.py

@@ -20,7 +20,7 @@
                'hospitali', 'sanatorium', 'health centre']
 es = Elastic()
 
-sms_handler = Blueprint('sms_handler', __name__)
+sms_handler = Blueprint("sms_handler", __name__)
 
 
 @sms_handler.route("/sms", methods=['GET'])