Fix NoneType Error for optional environment variables

hellohaptik · Sep 20, 2018 · f3316eb · f3316eb
1 parent 1c18e2a
commit f3316eb
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 21 deletions.
diff --git a/chatbot_ner/config.py b/chatbot_ner/config.py
@@ -1,5 +1,6 @@
 import logging.handlers
 import os
+
 import dotenv
 from elasticsearch import RequestsHttpConnection
 from requests_aws4auth import AWS4Auth
@@ -13,7 +14,6 @@
 if not os.path.exists(LOG_PATH):
     os.makedirs(LOG_PATH)
 
-
 # LOGGING
 # TODO - Make this much generic & simpler in the future
 LOG_LEVEL = os.environ.get('DJANGO_LOG_LEVEL', 'error').upper()
@@ -37,7 +37,6 @@
 ner_logger.addHandler(handler)
 ner_logger.addHandler(handler_stdout)
 
-
 # SETUP NLP LIB LOGGING
 NLP_LIB_LOG_FILENAME = os.path.join(LOG_PATH, 'nlp_log.log')
 # Set up a specific logger with our desired output level
@@ -49,7 +48,6 @@
 nlp_logger.addHandler(handler)
 nlp_logger.addHandler(handler_stdout)
 
-
 if os.path.exists(CONFIG_PATH):
     dotenv.read_dotenv(CONFIG_PATH)
 else:
@@ -72,18 +70,6 @@
 ES_AUTH_PASSWORD = os.environ.get('ES_AUTH_PASSWORD')
 ES_BULK_MSG_SIZE = os.environ.get('ES_BULK_MSG_SIZE', '10000')
 ES_SEARCH_SIZE = os.environ.get('ES_SEARCH_SIZE', '10000')
-ES_INDEX_1 = os.environ.get('ES_INDEX_1')
-ES_INDEX_2 = os.environ.get('ES_INDEX_2')
-DESTINATION_ES_SCHEME = os.environ.get('DESTINATION_ES_SCHEME')
-DESTINATION_HOST = os.environ.get('DESTINATION_HOST')
-DESTINATION_PORT = os.environ.get('DESTINATION_PORT')
-DESTINATION_URL = (DESTINATION_ES_SCHEME + "://" +
-                   DESTINATION_HOST + ":" +
-                   DESTINATION_PORT)
-ES_ALIAS = os.environ.get('ES_ALIAS')
-ES_SCHEME = os.environ.get('ES_SCHEME')
-ELASTICSEARCH_CRF_DATA_INDEX_NAME = os.environ.get('ELASTICSEARCH_CRF_DATA_INDEX_NAME')
-ELASTICSEARCH_CRF_DATA_DOC_TYPE = os.environ.get('ELASTICSEARCH_CRF_DATA_DOC_TYPE')
 
 try:
     ES_BULK_MSG_SIZE = int(ES_BULK_MSG_SIZE)
@@ -92,10 +78,19 @@
     ES_BULK_MSG_SIZE = 10000
     ES_SEARCH_SIZE = 10000
 
-ES_AWS_SECRET_ACCESS_KEY = os.environ.get('ES_AWS_SECRET_ACCESS_KEY')
-ES_AWS_ACCESS_KEY_ID = os.environ.get('ES_AWS_ACCESS_KEY_ID')
-ES_AWS_REGION = os.environ.get('ES_AWS_REGION')
-ES_AWS_SERVICE = os.environ.get('ES_AWS_SERVICE')
+# Optional Vars
+ES_INDEX_1 = os.environ.get('ES_INDEX_1')
+ES_INDEX_2 = os.environ.get('ES_INDEX_2')
+DESTINATION_ES_SCHEME = os.environ.get('DESTINATION_ES_SCHEME', 'http')
+DESTINATION_HOST = os.environ.get('DESTINATION_HOST')
+DESTINATION_PORT = os.environ.get('DESTINATION_PORT')
+DESTINATION_URL = '{scheme}://{host}:{port}'.format(**{'scheme': DESTINATION_ES_SCHEME,
+                                                       'host': DESTINATION_HOST,
+                                                       'port': DESTINATION_PORT})
+ES_ALIAS = os.environ.get('ES_ALIAS')
+ES_SCHEME = os.environ.get('ES_SCHEME')
+ELASTICSEARCH_CRF_DATA_INDEX_NAME = os.environ.get('ELASTICSEARCH_CRF_DATA_INDEX_NAME')
+ELASTICSEARCH_CRF_DATA_DOC_TYPE = os.environ.get('ELASTICSEARCH_CRF_DATA_DOC_TYPE')
 GOOGLE_TRANSLATE_API_KEY = os.environ.get('GOOGLE_TRANSLATE_API_KEY')
 
 if not GOOGLE_TRANSLATE_API_KEY:
@@ -135,6 +130,11 @@
 else:
     CHATBOT_NER_DATASTORE['elasticsearch']['doc_type'] = 'data_dictionary'
 
+ES_AWS_SECRET_ACCESS_KEY = os.environ.get('ES_AWS_SECRET_ACCESS_KEY')
+ES_AWS_ACCESS_KEY_ID = os.environ.get('ES_AWS_ACCESS_KEY_ID')
+ES_AWS_REGION = os.environ.get('ES_AWS_REGION')
+ES_AWS_SERVICE = os.environ.get('ES_AWS_SERVICE')
+
 if not ES_AWS_SERVICE:
     ES_AWS_SERVICE = 'es'
 
@@ -151,6 +151,7 @@
 else:
     ner_logger.warning('Elasticsearch: Some or all AWS settings missing from environment, this will skip AWS auth!')
 
+# Model Vars
 if os.path.exists(MODEL_CONFIG_PATH):
     dotenv.read_dotenv(MODEL_CONFIG_PATH)
 else:

diff --git a/chatbot_ner/settings.py b/chatbot_ner/settings.py
@@ -20,9 +20,9 @@
 SECRET_KEY = '70vigjv=h)=p8d%e80(3ue2p70e^x96#n8u+7ia9+7o02iq*6k'
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = False
+DEBUG = os.environ.get('DJANGO_DEBUG', False)
 
-TEMPLATE_DEBUG = True
+TEMPLATE_DEBUG = False
 
 ALLOWED_HOSTS = ['*']
 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -23,6 +23,7 @@ services:
       - "DJANGO_SETTINGS_MODULE=chatbot_ner.settings"
       - "DJANGO_WSGI_MODULE=chatbot_ner/wsgi.py"
       - "DJANGO_LOG_LEVEL=debug"
+      - "DJANGO_DEBUG=False"
       - "PORT=8081"
       - "TIMEOUT=600"
       - "ENGINE=elasticsearch"