Merge pull request #1043 from netfs/cpr1.10

Cherrypick changes from master

Author: netfs

tensorflow_serving/apis/prediction_service_pb2.py

@@ -12,11 +12,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ==============================================================================
-# Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: tensorflow_serving/apis/prediction_service.proto
+#
 # To regenerate run
 # python -m grpc.tools.protoc --python_out=. --grpc_python_out=. -I. tensorflow_serving/apis/prediction_service.proto
 
+### @@AUTOGENERATED SECTION STARTS HERE@@
+
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: tensorflow_serving/apis/prediction_service.proto
+
 import sys
 _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
 from google.protobuf import descriptor as _descriptor
@@ -112,3 +116,17 @@
 DESCRIPTOR.services_by_name['PredictionService'] = _PREDICTIONSERVICE
 
 # @@protoc_insertion_point(module_scope)
+
+### @@AUTOGENERATED SECTION ENDS HERE@@
+
+
+def beta_create_PredictionService_stub(channel):
+  import warnings
+  from tensorflow_serving.apis import prediction_service_pb2_grpc
+  warnings.simplefilter('default')
+  warnings.warn(
+      'beta_create_PredictionService_stub() method is deprecated. '
+      'This method will be removed in near future versions of TF '
+      'Serving. Please switch to GA gRPC API in '
+      'prediction_service_pb2_grpc.', DeprecationWarning)
+  return prediction_service_pb2_grpc.PredictionServiceStub(channel._channel)

tensorflow_serving/model_servers/BUILD

@@ -343,6 +343,27 @@ py_test(
     ],
 )
 
+py_test(
+    name = "tensorflow_model_server_beta_grpc_test",
+    size = "medium",
+    srcs = ["tensorflow_model_server_beta_grpc_test.py"],
+    data = [
+        ":tensorflow_model_server",
+        "@org_tensorflow//tensorflow/cc/saved_model:saved_model_half_plus_two",
+        #"//tensorflow_serving/servables/tensorflow/testdata:batching_config.txt",
+        "//tensorflow_serving/servables/tensorflow/testdata:good_model_config.txt",
+        "//tensorflow_serving/servables/tensorflow/testdata:saved_model_half_plus_three/00000123/assets/foo.txt",
+        "//tensorflow_serving/servables/tensorflow/testdata:saved_model_half_plus_three/00000123/saved_model.pb",
+        "//tensorflow_serving/servables/tensorflow/testdata:saved_model_half_plus_three/00000123/variables/variables.data-00000-of-00001",
+        "//tensorflow_serving/servables/tensorflow/testdata:saved_model_half_plus_three/00000123/variables/variables.index",
+    ],
+    tags = ["notsan"],
+    deps = [
+        "//tensorflow_serving/apis:prediction_service_proto_py_pb2",
+        "@org_tensorflow//tensorflow:tensorflow_py",
+    ],
+)
+
 py_binary(
     name = "tensorflow_model_server_test_client",
     srcs = ["tensorflow_model_server_test_client.py"],