Reverted new file addition, added another make test cmd

This reverts commit ef0a2f3.

Makefile

@@ -35,6 +35,7 @@ test_prepare: test_requirements.txt $(ACTIVATE)
 
 test: test_prepare $(ACTIVATE) dev
 	@. $(ACTIVATE); spacy download en
+	@. $(ACTIVATE); python -c 'from nlp_architect.api.ner_api import NerApi; NerApi(prompt=False)'
 	@. $(ACTIVATE); py.test -rs -vv tests
 
 flake: test_prepare

doc/source/service.rst

@@ -39,9 +39,7 @@ The server code is split into two pieces:
 1. :py:class:`Service <server.service>` which is a representation of each model's API
 2. :py:mod:`Server <server.serve>` which handles processing of HTTP requests
 
-To run the server, from the root directory simply run ``hug -p 8080 --fetch -f server/serve.py``, the server will run on `http://localhost:8080`.
-Note: the ``--fetch`` allows you to prefetch the models, requiring you to respond to the prompt for each model.
-
+To run the server, from the root directory simply run ``hug -p 8080 -f server/serve.py``, the server will run on `http://localhost:8080`.
 
 If you wish to use the server's visualization - enter `http://localhost:8080`
 

nlp_architect/api/ner_api.py

@@ -35,7 +35,7 @@ class NerApi(AbstractApi):
     pretrained_model = path.join(dir, 'ner-pretrained', 'model.h5')
     pretrained_model_info = path.join(dir, 'ner-pretrained', 'model_info.dat')
 
-    def __init__(self, prompt=True):
+    def __init__(self, ner_model=None, prompt=True):
         self.model = None
         self.model_info = None
         self.model_path = NerApi.pretrained_model
@@ -81,7 +81,7 @@ def _prompt(self):
     def _download_pretrained_model(self, prompt=True):
         """Downloads the pre-trained BIST model if non-existent."""
         dir_path = path.join(self.dir, 'ner-pretrained')
-        if not path.isfile(self.model_path) or not path.isfile(self.model_info_path):
+        if not path.isfile(path.join(dir_path, 'model.h5')):
             print('The pre-trained models to be downloaded for the NER dataset'
                   'are licensed under Apache 2.0. By downloading, you accept the terms'
                   'and conditions provided by the license')

server/serve.py

@@ -20,15 +20,9 @@
 import json
 from falcon import status_codes
 from server.service import format_response
-from argparse import ArgumentParser
 from server.service import Service, parse_headers
 services = {}
 
-parser = ArgumentParser()
-parser.add_argument('--fetch', action='store_true')
-args = parser.parse_known_args()
-prefetch_val = args[0].fetch
-
 api = hug.API(__name__)
 
 
@@ -84,5 +78,4 @@ def static():
     return [os.path.realpath(os.path.join('./', 'server/web_service/static'))]
 
 
-if prefetch_val is True:
-    prefetchModels()
+prefetchModels()

tests/test_server_sanity.py

@@ -23,7 +23,7 @@
 import os
 from os.path import dirname
 import pytest
-from tests.download_ner import download
+import server.serve
 from nlp_architect.utils.text import is_spacy_model_installed
 from server.serve import api
 if not is_spacy_model_installed('en'):
@@ -40,8 +40,6 @@
            "IS-HTML": "False"}
 server_data_rel_path = 'fixtures/data/server/'
 
-download()
-
 
 def load_test_data(service_name):
     """
@@ -153,7 +151,7 @@ def test_json_file_request(service_name):
     myHeaders = headers.copy()
     myHeaders["Content-Type"] = "application/json"
     myHeaders["RESPONSE-FORMAT"] = "json"
-    response = hug.test.post(api, '/inference', body=doc, headers=myHeaders)
+    response = hug.test.post(server.serve, '/inference', body=doc, headers=myHeaders)
     assert_response_struct(response.data, json.loads(expected_result))
     assert response.status == hug.HTTP_OK