Swap order of processing json_request to prevent bad jsonlines request. (#224)

* Swap order of processing json_request to prevent bad jsonlines request.

* Remove extra space.

* Fix dockerfiles by removing no longer needed, errant cleanup.

* Remove redundant if condition.

Author: matherit

docker/1.15/Dockerfile.gpu

@@ -32,7 +32,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Fix cuda repo's GPG key. Nvidia is no longer updating the machine-learning repo.
 # Need to manually pull and install necessary debs to continue using these versions.
 RUN rm /etc/apt/sources.list.d/cuda.list \
-&& rm /etc/apt/sources.list.d/nvidia-ml.list \
 && apt-key del 7fa2af80 \
 && apt-get update && apt-get install -y --no-install-recommends wget \
 && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-keyring_1.0-1_all.deb \

docker/2.1/Dockerfile.gpu

@@ -30,7 +30,6 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Fix cuda repo's GPG key. Nvidia is no longer updating the machine-learning repo.
 # Need to manually pull and install necessary debs to continue using these versions.
 RUN rm /etc/apt/sources.list.d/cuda.list \
-&& rm /etc/apt/sources.list.d/nvidia-ml.list \
 && apt-key del 7fa2af80 \
 && apt-get update && apt-get install -y --no-install-recommends wget \
 && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/cuda-keyring_1.0-1_all.deb \

docker/build_artifacts/sagemaker/tensorflowServing.js

@@ -140,10 +140,10 @@ function parse_custom_attributes(r) {
 function json_request(r) {
     var data = r.requestBody
 
-    if (is_json_lines(data)) {
-        json_lines_request(r, data)
-    } else if (is_tfs_json(data)) {
+    if (is_tfs_json(data)) {
         tfs_json_request(r, data)
+    } else if (is_json_lines(data)) {
+        json_lines_request(r, data)
     } else {
         generic_json_request(r, data)
     }

test/integration/local/test_container.py

@@ -127,6 +127,21 @@ def test_predict_two_instances():
     assert y == {"predictions": [[3.5, 4.0, 5.5], [3.5, 4.0, 5.5]]}
 
 
+def test_predict_instance_jsonlines_input_error():
+    """
+    Test with input that previously triggered jsonlines code in tensorflowServing.js
+    Will still produce error - but error should be 'Type: String is not of expected type: float'
+    """
+    x = {"instances": ["]["]}
+    y = make_request(json.dumps(x))
+    assert (
+        "error" in y
+        and y["error"]
+        == "Failed to process element: 0 of 'instances' list. Error: Invalid argument:"
+        + ' JSON Value: "][" Type: String is not of expected type: float'
+    )
+
+
 def test_predict_jsons_json_content_type():
     x = "[1.0, 2.0, 5.0]\n[1.0, 2.0, 5.0]"
     y = make_request(x)