Merge pull request tensorflow#299 from kirilg/branch_144997521

Upstream internal changes

Author: kirilg

WORKSPACE

@@ -10,5 +10,5 @@ load('//tensorflow_serving:workspace.bzl', 'tf_serving_workspace')
 tf_serving_workspace()
 
 # Specify the minimum required bazel version.
-load("@org_tensorflow//tensorflow:tensorflow.bzl", "check_version")
+load("@org_tensorflow//tensorflow:workspace.bzl", "check_version")
 check_version("0.4.2")

tensorflow

@@ -16,7 +16,7 @@
 # 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'))
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
 from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
@@ -26,118 +26,141 @@
 
 _sym_db = _symbol_database.Default()
 
-from tensorflow_serving.apis import predict_pb2 as third__party_dot_tensorflow__serving_dot_apis_dot_predict__pb2
+
+from tensorflow_serving.apis import predict_pb2 as tensorflow__serving_dot_apis_dot_predict__pb2
+
 
 DESCRIPTOR = _descriptor.FileDescriptor(
-    name='tensorflow_serving/apis/prediction_service.proto',
-    package='tensorflow.serving',
-    syntax='proto3',
-    serialized_pb=_b(
-        '\n<tensorflow_serving/apis/prediction_service.proto\x12\x12tensorflow.serving\x1a\x31tensorflow_serving/apis/predict.proto2g\n\x11PredictionService\x12R\n\x07Predict\x12\".tensorflow.serving.PredictRequest\x1a#.tensorflow.serving.PredictResponseB\x03\xf8\x01\x01\x62\x06proto3'),
-    dependencies=[
-        third__party_dot_tensorflow__serving_dot_apis_dot_predict__pb2.
-        DESCRIPTOR,
-    ])
+  name='tensorflow_serving/apis/prediction_service.proto',
+  package='tensorflow.serving',
+  syntax='proto3',
+  serialized_pb=_b('\n0tensorflow_serving/apis/prediction_service.proto\x12\x12tensorflow.serving\x1a%tensorflow_serving/apis/predict.proto2g\n\x11PredictionService\x12R\n\x07Predict\x12\".tensorflow.serving.PredictRequest\x1a#.tensorflow.serving.PredictResponseB\x03\xf8\x01\x01\x62\x06proto3')
+  ,
+  dependencies=[tensorflow__serving_dot_apis_dot_predict__pb2.DESCRIPTOR,])
 _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
+
+
+
+
 DESCRIPTOR.has_options = True
-DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(),
-                                                _b('\370\001\001'))
-from grpc.beta import implementations as beta_implementations
-from grpc.beta import interfaces as beta_interfaces
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\370\001\001'))
+
+import grpc
 from grpc.framework.common import cardinality
 from grpc.framework.interfaces.face import utilities as face_utilities
+from grpc.beta import implementations as beta_implementations
+from grpc.beta import interfaces as beta_interfaces
 
 
-class BetaPredictionServiceServicer(object):
-  """PredictionService provides basic machine learning methods.
+class PredictionServiceStub(object):
+  """PredictionService provides access to machine-learned models loaded by
+  model_servers.
+  """
+
+  def __init__(self, channel):
+    """Constructor.
+
+    Args:
+      channel: A grpc.Channel.
+    """
+    self.Predict = channel.unary_unary(
+        '/tensorflow.serving.PredictionService/Predict',
+        request_serializer=tensorflow__serving_dot_apis_dot_predict__pb2.PredictRequest.SerializeToString,
+        response_deserializer=tensorflow__serving_dot_apis_dot_predict__pb2.PredictResponse.FromString,
+        )
 
-  TODO(b/28599843): Decide whether to keep the separate services in addition to
-  this combined service.
+
+class PredictionServiceServicer(object):
+  """PredictionService provides access to machine-learned models loaded by
+  model_servers.
   """
 
   def Predict(self, request, context):
-    """Predict.
+    """Predict -- provides access to loaded TensorFlow model.
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
+
+
+def add_PredictionServiceServicer_to_server(servicer, server):
+  rpc_method_handlers = {
+      'Predict': grpc.unary_unary_rpc_method_handler(
+          servicer.Predict,
+          request_deserializer=tensorflow__serving_dot_apis_dot_predict__pb2.PredictRequest.FromString,
+          response_serializer=tensorflow__serving_dot_apis_dot_predict__pb2.PredictResponse.SerializeToString,
+      ),
+  }
+  generic_handler = grpc.method_handlers_generic_handler(
+      'tensorflow.serving.PredictionService', rpc_method_handlers)
+  server.add_generic_rpc_handlers((generic_handler,))
+
+
+class BetaPredictionServiceServicer(object):
+  """The Beta API is deprecated for 0.15.0 and later.
+
+  It is recommended to use the GA API (classes and functions in this
+  file not marked beta) for all further purposes. This class was generated
+  only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+  """PredictionService provides access to machine-learned models loaded by
+  model_servers.
+  """
+  def Predict(self, request, context):
+    """Predict -- provides access to loaded TensorFlow model.
     """
     context.code(beta_interfaces.StatusCode.UNIMPLEMENTED)
 
 
 class BetaPredictionServiceStub(object):
-  """PredictionService provides basic machine learning methods.
+  """The Beta API is deprecated for 0.15.0 and later.
 
-  TODO(b/28599843): Decide whether to keep the separate services in addition to
-  this combined service.
+  It is recommended to use the GA API (classes and functions in this
+  file not marked beta) for all further purposes. This class was generated
+  only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0."""
+  """PredictionService provides access to machine-learned models loaded by
+  model_servers.
   """
-
-  def Predict(self,
-              request,
-              timeout,
-              metadata=None,
-              with_call=False,
-              protocol_options=None):
-    """Predict.
+  def Predict(self, request, timeout, metadata=None, with_call=False, protocol_options=None):
+    """Predict -- provides access to loaded TensorFlow model.
     """
     raise NotImplementedError()
-
   Predict.future = None
 
 
-def beta_create_PredictionService_server(servicer,
-                                         pool=None,
-                                         pool_size=None,
-                                         default_timeout=None,
-                                         maximum_timeout=None):
+def beta_create_PredictionService_server(servicer, pool=None, pool_size=None, default_timeout=None, maximum_timeout=None):
+  """The Beta API is deprecated for 0.15.0 and later.
+
+  It is recommended to use the GA API (classes and functions in this
+  file not marked beta) for all further purposes. This function was
+  generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
   request_deserializers = {
-      ('tensorflow.serving.PredictionService', 'Predict'):
-          third__party_dot_tensorflow__serving_dot_apis_dot_predict__pb2.
-          PredictRequest.FromString,
+    ('tensorflow.serving.PredictionService', 'Predict'): tensorflow__serving_dot_apis_dot_predict__pb2.PredictRequest.FromString,
   }
   response_serializers = {
-      ('tensorflow.serving.PredictionService', 'Predict'):
-          third__party_dot_tensorflow__serving_dot_apis_dot_predict__pb2.
-          PredictResponse.SerializeToString,
+    ('tensorflow.serving.PredictionService', 'Predict'): tensorflow__serving_dot_apis_dot_predict__pb2.PredictResponse.SerializeToString,
   }
   method_implementations = {
-      ('tensorflow.serving.PredictionService', 'Predict'):
-          face_utilities.unary_unary_inline(servicer.Predict),
+    ('tensorflow.serving.PredictionService', 'Predict'): face_utilities.unary_unary_inline(servicer.Predict),
   }
-  server_options = beta_implementations.server_options(
-      request_deserializers=request_deserializers,
-      response_serializers=response_serializers,
-      thread_pool=pool,
-      thread_pool_size=pool_size,
-      default_timeout=default_timeout,
-      maximum_timeout=maximum_timeout)
-  return beta_implementations.server(
-      method_implementations, options=server_options)
-
-
-def beta_create_PredictionService_stub(channel,
-                                       host=None,
-                                       metadata_transformer=None,
-                                       pool=None,
-                                       pool_size=None):
+  server_options = beta_implementations.server_options(request_deserializers=request_deserializers, response_serializers=response_serializers, thread_pool=pool, thread_pool_size=pool_size, default_timeout=default_timeout, maximum_timeout=maximum_timeout)
+  return beta_implementations.server(method_implementations, options=server_options)
+
+
+def beta_create_PredictionService_stub(channel, host=None, metadata_transformer=None, pool=None, pool_size=None):
+  """The Beta API is deprecated for 0.15.0 and later.
+
+  It is recommended to use the GA API (classes and functions in this
+  file not marked beta) for all further purposes. This function was
+  generated only to ease transition from grpcio<0.15.0 to grpcio>=0.15.0"""
   request_serializers = {
-      ('tensorflow.serving.PredictionService', 'Predict'):
-          third__party_dot_tensorflow__serving_dot_apis_dot_predict__pb2.
-          PredictRequest.SerializeToString,
+    ('tensorflow.serving.PredictionService', 'Predict'): tensorflow__serving_dot_apis_dot_predict__pb2.PredictRequest.SerializeToString,
   }
   response_deserializers = {
-      ('tensorflow.serving.PredictionService', 'Predict'):
-          third__party_dot_tensorflow__serving_dot_apis_dot_predict__pb2.
-          PredictResponse.FromString,
+    ('tensorflow.serving.PredictionService', 'Predict'): tensorflow__serving_dot_apis_dot_predict__pb2.PredictResponse.FromString,
+  }
+  cardinalities = {
+    'Predict': cardinality.Cardinality.UNARY_UNARY,
   }
-  cardinalities = {'Predict': cardinality.Cardinality.UNARY_UNARY,}
-  stub_options = beta_implementations.stub_options(
-      host=host,
-      metadata_transformer=metadata_transformer,
-      request_serializers=request_serializers,
-      response_deserializers=response_deserializers,
-      thread_pool=pool,
-      thread_pool_size=pool_size)
-  return beta_implementations.dynamic_stub(
-      channel,
-      'tensorflow.serving.PredictionService',
-      cardinalities,
-      options=stub_options)
-# @@protoc_insertion_point(module_scope)
+  stub_options = beta_implementations.stub_options(host=host, metadata_transformer=metadata_transformer, request_serializers=request_serializers, response_deserializers=response_deserializers, thread_pool=pool, thread_pool_size=pool_size)
+  return beta_implementations.dynamic_stub(channel, 'tensorflow.serving.PredictionService', cardinalities, options=stub_options)

tensorflow_serving/apis/prediction_service_pb2.py

@@ -217,6 +217,9 @@ Status BatchingSession::Run(
   if (batch_scheduler_it == batch_schedulers_.end()) {
     // We have a Run() call that doesn't match one of our batching signatures.
     // Run it in-line.
+    LOG(WARNING) << "Request doesn't match any declared signature. Bypassing "
+                    "batcher. Request signature is: "
+                 << TensorSignatureDebugString(signature);
     return wrapped_->Run(inputs, output_tensor_names, target_node_names,
                          outputs);
   }

tensorflow_serving/batching/batching_session.cc

@@ -27,8 +27,9 @@ serving_proto_library(
     srcs = ["model_server_config.proto"],
     cc_api_version = 2,
     deps = [
-        "@protobuf//:cc_wkt_protos",
+        ":logging_config_proto",
         "//tensorflow_serving/sources/storage_path:file_system_storage_path_source_proto",
+        "@protobuf//:cc_wkt_protos",
     ],
 )
 

tensorflow_serving/config/BUILD

@@ -4,6 +4,7 @@ package tensorflow.serving;
 option cc_enable_arenas = true;
 
 import "google/protobuf/any.proto";
+import "tensorflow_serving/config/logging_config.proto";
 import "tensorflow_serving/sources/storage_path/file_system_storage_path_source.proto";
 
 // The type of model.
@@ -35,6 +36,9 @@ message ModelConfig {
   // be served at the same time.
   // The default option is to serve only the latest version of the model.
   FileSystemStoragePathSourceConfig.VersionPolicy version_policy = 5;
+
+  // Configures logging requests and responses, to the model.
+  LoggingConfig logging_config = 6;
 }
 
 // Static list of models to be loaded for serving.