Merge pull request #57 from victordibia/dev

Fix username/password bug, add ui build to enable easier local setup

Author: victordibia

docs/index.rst

@@ -24,6 +24,14 @@ Launch the web interface via command line:
 
  neuralqa ui --port 5000 
 
+You can also clone this repository, make changes and launch the application directly from repository:
+
+.. code-block:: shell
+
+ python neuralqa/cli.py ui
+
+
+
 .. image:: https://raw.githubusercontent.com/victordibia/neuralqa/master/docs/images/manual.jpg
  :width: 100% 
  :alt: NeuralQA User Interface Screenshot

neuralqa/config_default.yaml

@@ -62,15 +62,14 @@ retriever:
  value: "none"
  type: "none"
 
-
  # - name: Case Law
  # value: cases
- # host: localhost
- # port: 9200
- # username: None
- # password: None
  # type: elasticsearch
- # fields:
+ # connection:
+ # host: localhost
+ # port: 9200
+ # username: ""
+ # password: ""
  # body_field: "casebody.data.opinions.text"
  # - name: Medical
  # value: medical

neuralqa/retriever/elasticsearchretriever.py

@@ -8,19 +8,24 @@
 
 
 class ElasticSearchRetriever(Retriever):
- def __init__(self, index_type="elasticsearch", host="localhost", port=9200, **kwargs):
+ def __init__(self, index_type="elasticsearch", host="localhost", port=9200, username="", password="", **kwargs):
  Retriever.__init__(self, index_type)
 
- self.username = ""
- self.password = ""
+ self.username = username
+ self.password = password
  self.body_field = ""
  self.host = host
  self.port = port
-
  allowed_keys = list(self.__dict__.keys())
  self.__dict__.update((k, v)
  for k, v in kwargs.items() if k in allowed_keys)
- self.es = Elasticsearch([{'host': self.host, 'port': self.port}])
+
+ print(self.__dict__)
+ # self.es = Elasticsearch(
+ # [{'host': self.host, 'port': self.port,
+ # "username": self.username, "password": self.password}])
+ self.es = Elasticsearch(hosts=[{"host": self.host, "port": self.port}],
+ http_auth=(self.username, self.password))
  self.isAvailable = self.es.ping()
 
  rejected_keys = set(kwargs.keys()) - set(allowed_keys)

neuralqa/retriever/retrieverpool.py

@@ -16,7 +16,7 @@ def __init__(self, retrievers):
 
  if (retriever["type"] == "elasticsearch"):
  self.retriever_pool[retriever["value"]] = ElasticSearchRetriever(
- host=retriever["host"], port=retriever["port"], body_field=retriever["fields"]["body_field"])
+ **retriever["connection"])
  if (retriever["type"] == "solr"):
  logger.info("We do not yet support Solr retrievers")
  self.selected_retriever = retrievers["selected"]

neuralqa/server/ui/.gitignore

@@ -9,7 +9,7 @@ public/images/extra
 /coverage
 
 # production
-# /build
+!build
 
 # misc
 .DS_Store

neuralqa/server/ui/build/android-chrome-192x192.png

@@ -0,0 +1,22 @@
+{
+ "files": {
+ "main.css": "/static/css/main.0d7f6602.chunk.css",
+ "main.js": "/static/js/main.32abfeaf.chunk.js",
+ "main.js.map": "/static/js/main.32abfeaf.chunk.js.map",
+ "runtime-main.js": "/static/js/runtime-main.985d1449.js",
+ "runtime-main.js.map": "/static/js/runtime-main.985d1449.js.map",
+ "static/js/2.17f05cd8.chunk.js": "/static/js/2.17f05cd8.chunk.js",
+ "static/js/2.17f05cd8.chunk.js.map": "/static/js/2.17f05cd8.chunk.js.map",
+ "index.html": "/index.html",
+ "precache-manifest.f2ddb522e87f24d57699361b5d062612.js": "/precache-manifest.f2ddb522e87f24d57699361b5d062612.js",
+ "service-worker.js": "/service-worker.js",
+ "static/css/main.0d7f6602.chunk.css.map": "/static/css/main.0d7f6602.chunk.css.map",
+ "static/js/2.17f05cd8.chunk.js.LICENSE.txt": "/static/js/2.17f05cd8.chunk.js.LICENSE.txt"
+ },
+ "entrypoints": [
+ "static/js/runtime-main.985d1449.js",
+ "static/js/2.17f05cd8.chunk.js",
+ "static/css/main.0d7f6602.chunk.css",
+ "static/js/main.32abfeaf.chunk.js"
+ ]
+}