GRPC API for javascript models with Nodejs s2i wrapper

cluster-manager/src/main/java/io/seldon/clustermanager/k8s/SeldonDeploymentControllerImpl.java

@@ -269,6 +269,7 @@ public void createOrReplaceSeldonDeployment(SeldonDeployment mlDep) {
 		    if (existing == null || !existing.getSpec().equals(mlDep.getSpec()))
 		    {
 		        logger.debug("Running updates for "+mlDep.getMetadata().getName());
+		        SeldonDeployment mlDepStatusUpdated = operator.updateStatus(mlDep);
 		        SeldonDeployment mlDep2 = operator.defaulting(mlDep);
 		        operator.validate(mlDep2);
 		        mlCache.put(mlDep2);
@@ -281,13 +282,13 @@ public void createOrReplaceSeldonDeployment(SeldonDeployment mlDep) {
 		        //removeServices(client,namespace, mlDep2, resources.services); //Proto Client not presently working for deletion
 		        ApiClient client2 = clientProvider.getClient();
 		        removeServices(client2,namespace, mlDep2, resources.services);
-		        if (!mlDep.getSpec().equals(mlDep2.getSpec()))
+		        if (!mlDep.getSpec().equals(mlDepStatusUpdated.getSpec()))
 		        {
-		            logger.debug("Pushing updated SeldonDeployment "+mlDep2.getMetadata().getName()+" back to kubectl");
-		            crdHandler.updateSeldonDeployment(mlDep2);
+		            logger.debug("Pushing updated SeldonDeployment "+mlDepStatusUpdated.getMetadata().getName()+" back to kubectl");
+		            crdHandler.updateSeldonDeployment(mlDepStatusUpdated);
 		        }
 		        else
-		            logger.debug("Not pushing an update as no change to spec for SeldonDeployment "+mlDep2.getMetadata().getName());
+		            logger.debug("Not pushing an update as no change to status for SeldonDeployment "+mlDep2.getMetadata().getName());
 		    }
 		    else
 		    {

cluster-manager/src/main/java/io/seldon/clustermanager/k8s/SeldonDeploymentOperator.java

@@ -21,6 +21,7 @@
 
 public interface SeldonDeploymentOperator {
 
+	public SeldonDeployment updateStatus(SeldonDeployment mlDep);
 	public SeldonDeployment defaulting(SeldonDeployment mlDep);
 	public void validate(SeldonDeployment mlDep) throws SeldonDeploymentException;
 	public DeploymentResources createResources(SeldonDeployment mlDep) throws SeldonDeploymentException;

cluster-manager/src/main/java/io/seldon/clustermanager/k8s/SeldonDeploymentOperatorImpl.java

@@ -356,7 +356,19 @@ public String getSeldonServiceName(SeldonDeployment dep,PredictorSpec pred,Strin
 		else
 			return svcName;
 	}
-
+
+	@Override
+	public SeldonDeployment updateStatus(SeldonDeployment mlDep) {
+		SeldonDeployment.Builder mlBuilder = SeldonDeployment.newBuilder(mlDep);
+
+		if (!mlBuilder.hasStatus())
+		{
+			mlBuilder.getStatusBuilder().setState(Constants.STATE_CREATING);
+		}
+
+		return mlBuilder.build();
+	}
+
 
 	@Override
 	public SeldonDeployment defaulting(SeldonDeployment mlDep) {
@@ -378,32 +390,34 @@ public SeldonDeployment defaulting(SeldonDeployment mlDep) {
 				for(int cIdx = 0;cIdx < spec.getSpec().getContainersCount();cIdx++)
 				{
 					V1.Container c = spec.getSpec().getContainers(cIdx);
-					String containerServiceKey = getPredictorServiceNameKey(c.getName());
-					String containerServiceValue = getSeldonServiceName(mlDep, p, c.getName());
-					metaBuilder.putLabels(containerServiceKey, containerServiceValue); 
-
-					int portNum;
-					if (servicePortMap.containsKey(c.getName()))
-						portNum = servicePortMap.get(c.getName());
-					else
+					// Only update graph and container if container is referenced in the inference graph
+					V1.Container c2;
+					if(isContainerInGraph(p.getGraph(), c))
 					{
-						portNum = currentServicePortNum;
-						servicePortMap.put(c.getName(), portNum);
-						currentServicePortNum++;
+						String containerServiceKey = getPredictorServiceNameKey(c.getName());
+						String containerServiceValue = getSeldonServiceName(mlDep, p, c.getName());
+						metaBuilder.putLabels(containerServiceKey, containerServiceValue); 
+
+						int portNum;
+						if (servicePortMap.containsKey(c.getName()))
+							portNum = servicePortMap.get(c.getName());
+						else
+						{
+							portNum = currentServicePortNum;
+							servicePortMap.put(c.getName(), portNum);
+							currentServicePortNum++;
+						}
+						c2 = this.updateContainer(c, findPredictiveUnitForContainer(mlDep.getSpec().getPredictors(pbIdx).getGraph(),c.getName()),portNum,deploymentName,predictorName);
+						updatePredictiveUnitBuilderByName(mlBuilder.getSpecBuilder().getPredictorsBuilder(pbIdx).getGraphBuilder(),c2,containerServiceValue); 
 					}
-					V1.Container c2 = this.updateContainer(c, findPredictiveUnitForContainer(mlDep.getSpec().getPredictors(pbIdx).getGraph(),c.getName()),portNum,deploymentName,predictorName);
+					else
+						c2 = c;
 					mlBuilder.getSpecBuilder().getPredictorsBuilder(pbIdx).getComponentSpecsBuilder(ptsIdx).getSpecBuilder().addContainers(cIdx, c2);	
-					updatePredictiveUnitBuilderByName(mlBuilder.getSpecBuilder().getPredictorsBuilder(pbIdx).getGraphBuilder(),c2,containerServiceValue); 
 				}
 				mlBuilder.getSpecBuilder().getPredictorsBuilder(pbIdx).getComponentSpecsBuilder(ptsIdx).setMetadata(metaBuilder);
 			}
 		}	
 
-		if (!mlBuilder.hasStatus())
-		{
-			mlBuilder.getStatusBuilder().setState(Constants.STATE_CREATING);
-		}
-
 		return mlBuilder.build();
 	}
 
@@ -504,6 +518,26 @@ private String getAmbassadorAnnotation(SeldonDeployment mlDep,String serviceName
 	    return restMapping + grpcMapping;
 	}
 
+	/**
+	 * 
+	 * @param pu - A predictiveUnit
+	 * @param container - a container
+	 * @return True if container name can be found in graph of pu
+	 */
+	private boolean isContainerInGraph(PredictiveUnit pu,V1.Container container)
+	{
+		 if (pu.getName().equals(container.getName()))
+		 {
+	       return true;
+		 }
+		 else 
+		 {
+			 for(int i=0;i<pu.getChildrenCount();i++)
+				 if (isContainerInGraph(pu.getChildren(i),container))
+					 return true;
+		 }
+		 return false;
+	}
 
 	private void addServicePort(PredictiveUnit pu,String serviceName,ServiceSpec.Builder svcSpecBuilder)
 	{
@@ -651,7 +685,8 @@ public DeploymentResources createResources(SeldonDeployment mlDep) throws Seldon
 					final String containerServiceKey = getPredictorServiceNameKey(c.getName());
 					final String containerServiceValue = getSeldonServiceName(mlDep, p, c.getName());
 
-					if (!createdServices.contains(containerServiceValue))
+					// Only add a Service if container is a Seldon component in graph and we haven't already created a service for this container name
+					if (isContainerInGraph(p.getGraph(), c) && !createdServices.contains(containerServiceValue))
 					{
 						//Add service
 						Service.Builder s = Service.newBuilder()
@@ -744,5 +779,6 @@ public DeploymentResources(List<Deployment> deployments, List<Service> services)
 	}
 
 
+
 
 }

docs/wrappers/nodejs.md

@@ -136,13 +136,14 @@ The name of the JS file containing the model.
 
 ### API_TYPE
 
-API type to create. Can be REST only at present.
+API type to create. Can be REST or GRPC.
 
 ### SERVICE_TYPE
 
 The service type being created. Available options are:
 
 - MODEL
+- TRANSFORMER
 
 ### PERSISTENCE
 

examples/models/nodejs_mnist/.s2i/environment_grpc

@@ -0,0 +1,4 @@
+MODEL_NAME=MnistClassifier.js
+API_TYPE=GRPC
+SERVICE_TYPE=MODEL
+PERSISTENCE=0

examples/models/nodejs_mnist/nodejs_mnist.ipynb

@@ -51,7 +51,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!s2i build . seldonio/seldon-core-s2i-nodejs:0.1 node-s2i-mnist-model:0.1"
+    "!s2i build . seldonio/seldon-core-s2i-nodejs:0.2-SNAPSHOT node-s2i-mnist-model:0.1"
    ]
   },
   {
@@ -97,6 +97,65 @@
     "!docker rm nodejs_mnist_predictor --force"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "## Prediction using GRPC API on the docker container"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!s2i build -E ./.s2i/environment_grpc . seldonio/seldon-core-s2i-nodejs:0.2-SNAPSHOT node-s2i-mnist-model:0.2"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!docker run --name \"nodejs_mnist_predictor\" -d --rm -p 5000:5000 node-s2i-mnist-model:0.2"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!cd ../../../wrappers/testing && make build_protos"
+   ]
+  },
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Send some random features that conform to the contract"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!python ../../../wrappers/testing/tester.py contract.json 0.0.0.0 5000 -p -t --grpc"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "!docker rm nodejs_mnist_predictor --force"
+   ]
+  },
   {
    "cell_type": "markdown",
    "metadata": {},
@@ -147,7 +206,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-nodejs:0.1 node-s2i-mnist-model:0.1"
+    "!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-nodejs:0.2-SNAPSHOT node-s2i-mnist-model:0.1"
    ]
   },
   {

examples/models/nodejs_tensorflow/.s2i/environment_grpc

@@ -0,0 +1,4 @@
+MODEL_NAME=MyModel.js
+API_TYPE=GRPC
+SERVICE_TYPE=MODEL
+PERSISTENCE=0

examples/models/nodejs_tensorflow/nodejs_tensorflow.ipynb

@@ -50,7 +50,7 @@
 			"metadata": {},
 			"outputs": [],
 			"source": [
-				"!s2i build . seldonio/seldon-core-s2i-nodejs:0.1 node-s2i-model-image:0.1"
+				"!s2i build . seldonio/seldon-core-s2i-nodejs:0.2-SNAPSHOT node-s2i-model-image:0.1"
 			]
 		},
 		{
@@ -96,6 +96,72 @@
 				"!docker rm nodejs_tensorflow_predictor --force"
 			]
 		},
+		{
+			"cell_type": "markdown",
+			"metadata": {},
+			"source": [
+				"## Prediction using GRPC API on the docker container"
+			]
+		},
+		{
+			"cell_type": "code",
+			"execution_count": null,
+			"metadata": {},
+			"outputs": [],
+			"source": [
+				"!s2i build -E ./.s2i/environment_grpc . seldonio/seldon-core-s2i-nodejs:0.2-SNAPSHOT node-s2i-model-image:0.2"
+			]
+		},
+		{
+			"cell_type": "code",
+			"execution_count": null,
+			"metadata": {},
+			"outputs": [],
+			"source": [
+				"!docker run --name \"nodejs_tensorflow_predictor\" -d --rm -p 5000:5000 node-s2i-model-image:0.2"
+			]
+		},
+		{
+			"cell_type": "code",
+			"execution_count": null,
+			"metadata": {},
+			"outputs": [],
+			"source": [
+				"!cd ../../../wrappers/testing && make build_protos"
+			]
+		},
+		{
+			"cell_type": "markdown",
+			"metadata": {},
+			"source": [
+				"Send some random features that conform to the contract"
+			]
+		},
+		{
+			"cell_type": "code",
+			"execution_count": null,
+			"metadata": {},
+			"outputs": [],
+			"source": [
+				"!python ../../../wrappers/testing/tester.py contract.json 0.0.0.0 5000 -p -t --grpc"
+			]
+		},
+		{
+			"cell_type": "code",
+			"execution_count": null,
+			"metadata": {},
+			"outputs": [],
+			"source": [
+				"!docker rm nodejs_tensorflow_predictor --force"
+			]
+		},
+		{
+			"cell_type": "markdown",
+			"metadata": {},
+			"source": [
+				"## Prediction using Minikube"
+			]
+		},
 		{
 			"cell_type": "code",
 			"execution_count": null,
@@ -139,7 +205,7 @@
 			"metadata": {},
 			"outputs": [],
 			"source": [
-				"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-nodejs:0.1 node-s2i-model-image:0.1"
+				"!eval $(minikube docker-env) && s2i build . seldonio/seldon-core-s2i-nodejs:0.2-SNAPSHOT node-s2i-model-image:0.1"
 			]
 		},
 		{

examples/models/nvidia-mnist/.s2i/environment

@@ -0,0 +1,4 @@
+MODEL_NAME=MnistTransformer
+API_TYPE=REST
+SERVICE_TYPE=TRANSFORMER
+PERSISTENCE=0

examples/models/nvidia-mnist/Makefile

@@ -0,0 +1,14 @@
+TRANSFORMER_IMAGE=seldonio/mnist-caffe2-transformer:0.1
+
+clean:
+	rm -f rm -f tensorrt_mnist/1/model.plan
+	rm -rf MNIST_data
+	rm -f mnist.json
+	rm -f tmp.json
+
+build_transformer:
+	s2i build . seldonio/seldon-core-s2i-python3:0.2 ${TRANSFORMER_IMAGE}
+
+push_transformer:
+	docker push ${TRANSFORMER_IMAGE}
+