RAIN-3244 Added support to fetch environment variable values (#891)

eGovStack · Aug 4, 2021 · fbea6fb · fbea6fb
1 parent c9f5206
commit fbea6fb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/nlp-engine/application.properties b/nlp-engine/application.properties
@@ -0,0 +1,15 @@
+########### MDMS SERVICE #####################
+
+MDMS_HOST = 'http://egov-mdms-service.egov:8080/'
+MDMS_SEARCH_URL = 'egov-mdms-service/v1/_search'
+MDMS_MODULE_NAME = 'Chatbot'
+CITY_MASTER = 'CityNames'
+CITY_LOCALE_MASTER = 'CityLocaleMasterData'
+
+########### EGOV-LOCATION SERVICE ###############
+EGOV_LOCATION_HOST = 'http://egov-location.egov:8080/'
+EGOV_LOCATION_SEARCH_URL = 'egov-location/location/v11/boundarys/_search'
+
+
+STATE_LEVEL_TENANTID = 'pb'
+DEFAULT_LOCALISATION_TENANT = 'pb'
diff --git a/nlp-engine/requirements.txt b/nlp-engine/requirements.txt
@@ -29,4 +29,4 @@ six==1.15.0
 sniffio==1.1.0
 tqdm==4.48.2
 urllib3==1.25.10
-Werkzeug==1.0.1
+Werkzeug==1.0.1
diff --git a/nlp-engine/src/CitySearch.py b/nlp-engine/src/CitySearch.py
@@ -6,14 +6,15 @@
 import nltk
 import requests
 import json
+import os
 
 translator= Translator()
 
 punct= string.punctuation
 
 url = MDMS_HOST + MDMS_SEARCH_URL
 data = {"RequestInfo":{},"MdmsCriteria":{"tenantId": "","moduleDetails":[{"moduleName":"", "masterDetails":[]}]}}
-data["MdmsCriteria"]["tenantId"] = STATE_LEVEL_TENANTID
+data["MdmsCriteria"]["tenantId"] = os.environ.get('DEFAULT_LOCALISATION_TENANT')
 data["MdmsCriteria"]["moduleDetails"][0]["moduleName"] = MDMS_MODULE_NAME
 masterDeatils = {"name":CITY_MASTER}
 data["MdmsCriteria"]["moduleDetails"][0]["masterDetails"].append(masterDeatils)

diff --git a/nlp-engine/src/Config.py b/nlp-engine/src/Config.py
@@ -11,4 +11,5 @@
 EGOV_LOCATION_SEARCH_URL = 'egov-location/location/v11/boundarys/_search'
 
 
-STATE_LEVEL_TENANTID = 'pb'
+STATE_LEVEL_TENANTID = 'pb'
+DEFAULT_LOCALISATION_TENANT = 'pb'