feat(proto): Add custom proto handling

Additional `customData` field added to the prediction protobuf, as well as updates to the python package to properly pass the raw protobuf section down to the `user_model` implementation. Addresses SeldonIO#1420 Signed off by Nick Groszewski (<[email protected]>)
groszewn · Apr 2, 2020 · 8f19e7b · 8f19e7b
1 parent d4c435e
commit 8f19e7b
Show file tree

Hide file tree

Showing 14 changed files with 4,336 additions and 1,694 deletions.
diff --git a/executor/api/grpc/prediction.pb.go b/executor/api/grpc/prediction.pb.go
diff --git a/proto/prediction.proto b/proto/prediction.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 
+import "google/protobuf/any.proto";
 import "google/protobuf/struct.proto";
 import "tensorflow/core/framework/tensor.proto";
 
@@ -20,6 +21,7 @@ message SeldonMessage {
     bytes binData = 4;
     string strData = 5;
     google.protobuf.Value jsonData = 6;
+    google.protobuf.Any customData = 7;
   }
 }
 
@@ -38,7 +40,7 @@ message Tensor {
 }
 
 message Meta {
-  string puid = 1; 
+  string puid = 1;
   map<string,google.protobuf.Value> tags = 2;
   map<string,int32> routing = 3;
   map<string,string> requestPath = 4;
@@ -101,7 +103,7 @@ service Generic {
 
 service Model {
   rpc Predict(SeldonMessage) returns (SeldonMessage) {};
-  rpc SendFeedback(Feedback) returns (SeldonMessage) {};  
+  rpc SendFeedback(Feedback) returns (SeldonMessage) {};
  }
 
 service Router {

diff --git a/python/seldon_core/proto/prediction.proto b/python/seldon_core/proto/prediction.proto
@@ -1,5 +1,6 @@
 syntax = "proto3";
 
+import "google/protobuf/any.proto";
 import "google/protobuf/struct.proto";
 import "tensorflow/core/framework/tensor.proto";
 
@@ -20,6 +21,7 @@ message SeldonMessage {
     bytes binData = 4;
     string strData = 5;
     google.protobuf.Value jsonData = 6;
+    google.protobuf.Any customData = 7;
   }
 }
 
@@ -38,7 +40,7 @@ message Tensor {
 }
 
 message Meta {
-  string puid = 1; 
+  string puid = 1;
   map<string,google.protobuf.Value> tags = 2;
   map<string,int32> routing = 3;
   map<string,string> requestPath = 4;
@@ -101,7 +103,7 @@ service Generic {
 
 service Model {
   rpc Predict(SeldonMessage) returns (SeldonMessage) {};
-  rpc SendFeedback(Feedback) returns (SeldonMessage) {};  
+  rpc SendFeedback(Feedback) returns (SeldonMessage) {};
  }
 
 service Router {

diff --git a/python/seldon_core/proto/prediction_pb2.py b/python/seldon_core/proto/prediction_pb2.py
diff --git a/python/seldon_core/proto/prediction_pb2.pyi b/python/seldon_core/proto/prediction_pb2.pyi