Merge pull request #4830 from Unity-Technologies/sensor-types-fix-proto-job

[Sensor-types] Fix proto generation job and apply patch

.yamato/protobuf-generation-test.yml

-test_mac_protobuf_generation:
+test_linux_protobuf_generation:
-    type: Unity::VM::osx
-    image: package-ci/mac:stable
-    flavor: b1.small
+    type: Unity::VM
+    image: package-ci/ubuntu:stable
+    flavor: b1.large
-    HOMEBREW_NO_AUTO_UPDATE: "1"
-      brew install nuget
+      sudo apt-get update && sudo apt-get install -y python3-venv nuget
+      python3 -m venv venv && source venv/bin/activate
-      python3 -m venv venv
-      . venv/bin/activate
-      cd protobuf-definitions
-      chmod +x Grpc.Tools.$GRPC_VERSION/tools/macosx_x64/protoc
-      chmod +x Grpc.Tools.$GRPC_VERSION/tools/macosx_x64/grpc_csharp_plugin
-      COMPILER=Grpc.Tools.$GRPC_VERSION/tools/macosx_x64 ./make.sh
+      pushd protobuf-definitions
+      chmod +x Grpc.Tools.$GRPC_VERSION/tools/linux_x64/protoc
+      chmod +x Grpc.Tools.$GRPC_VERSION/tools/linux_x64/grpc_csharp_plugin
+      COMPILER=Grpc.Tools.$GRPC_VERSION/tools/linux_x64 ./make.sh
+      popd
       mkdir -p artifacts
       touch artifacts/proto.patch
       git diff --exit-code -- :/ ":(exclude,top)$CS_PROTO_PATH/*.meta"                          \

ml-agents-envs/mlagents_envs/communicator_objects/unity_to_external_pb2.py

-# -*- coding: utf-8 -*-
-"""Generated protocol buffer code."""
+
+import sys
+_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
+from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
   name='mlagents_envs/communicator_objects/unity_to_external.proto',
   package='communicator_objects',
   syntax='proto3',
-  serialized_options=b'\252\002\"Unity.MLAgents.CommunicatorObjects',
-  create_key=_descriptor._internal_create_key,
-  serialized_pb=b'\n:mlagents_envs/communicator_objects/unity_to_external.proto\x12\x14\x63ommunicator_objects\x1a\x36mlagents_envs/communicator_objects/unity_message.proto2v\n\x14UnityToExternalProto\x12^\n\x08\x45xchange\x12\'.communicator_objects.UnityMessageProto\x1a\'.communicator_objects.UnityMessageProto\"\x00\x42%\xaa\x02\"Unity.MLAgents.CommunicatorObjectsb\x06proto3'
+  serialized_pb=_b('\n:mlagents_envs/communicator_objects/unity_to_external.proto\x12\x14\x63ommunicator_objects\x1a\x36mlagents_envs/communicator_objects/unity_message.proto2v\n\x14UnityToExternalProto\x12^\n\x08\x45xchange\x12\'.communicator_objects.UnityMessageProto\x1a\'.communicator_objects.UnityMessageProto\"\x00\x42%\xaa\x02\"Unity.MLAgents.CommunicatorObjectsb\x06proto3')
   ,
   dependencies=[mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.DESCRIPTOR,])
 
 
 
-DESCRIPTOR._options = None
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\252\002\"Unity.MLAgents.CommunicatorObjects'))
 
 _UNITYTOEXTERNALPROTO = _descriptor.ServiceDescriptor(
   name='UnityToExternalProto',
-  serialized_options=None,
-  create_key=_descriptor._internal_create_key,
+  options=None,
   serialized_start=140,
   serialized_end=258,
   methods=[
     containing_service=None,
     input_type=mlagents__envs_dot_communicator__objects_dot_unity__message__pb2._UNITYMESSAGEPROTO,
     output_type=mlagents__envs_dot_communicator__objects_dot_unity__message__pb2._UNITYMESSAGEPROTO,
-    serialized_options=None,
-    create_key=_descriptor._internal_create_key,
+    options=None,
   ),
 ])
 _sym_db.RegisterServiceDescriptor(_UNITYTOEXTERNALPROTO)

ml-agents-envs/mlagents_envs/communicator_objects/unity_to_external_pb2_grpc.py

 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
-"""Client and server classes corresponding to protobuf-defined services."""
 import grpc
 
 from mlagents_envs.communicator_objects import unity_message_pb2 as mlagents__envs_dot_communicator__objects_dot_unity__message__pb2
-    """Missing associated documentation comment in .proto file."""
+  # missing associated documentation comment in .proto file
+  pass
-    def __init__(self, channel):
-        """Constructor.
+  def __init__(self, channel):
+    """Constructor.
-        Args:
-            channel: A grpc.Channel.
-        """
-        self.Exchange = channel.unary_unary(
-                '/communicator_objects.UnityToExternalProto/Exchange',
-                request_serializer=mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.UnityMessageProto.SerializeToString,
-                response_deserializer=mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.UnityMessageProto.FromString,
-                )
+    Args:
+      channel: A grpc.Channel.
+    """
+    self.Exchange = channel.unary_unary(
+        '/communicator_objects.UnityToExternalProto/Exchange',
+        request_serializer=mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.UnityMessageProto.SerializeToString,
+        response_deserializer=mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.UnityMessageProto.FromString,
+        )
-    """Missing associated documentation comment in .proto file."""
+  # missing associated documentation comment in .proto file
+  pass
-    def Exchange(self, request, context):
-        """Sends the academy parameters
-        """
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-        context.set_details('Method not implemented!')
-        raise NotImplementedError('Method not implemented!')
+  def Exchange(self, request, context):
+    """Sends the academy parameters
+    """
+    context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+    context.set_details('Method not implemented!')
+    raise NotImplementedError('Method not implemented!')
-    rpc_method_handlers = {
-            'Exchange': grpc.unary_unary_rpc_method_handler(
-                    servicer.Exchange,
-                    request_deserializer=mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.UnityMessageProto.FromString,
-                    response_serializer=mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.UnityMessageProto.SerializeToString,
-            ),
-    }
-    generic_handler = grpc.method_handlers_generic_handler(
-            'communicator_objects.UnityToExternalProto', rpc_method_handlers)
-    server.add_generic_rpc_handlers((generic_handler,))
-
-
- # This class is part of an EXPERIMENTAL API.
-class UnityToExternalProto(object):
-    """Missing associated documentation comment in .proto file."""
-
-    @staticmethod
-    def Exchange(request,
-            target,
-            options=(),
-            channel_credentials=None,
-            call_credentials=None,
-            insecure=False,
-            compression=None,
-            wait_for_ready=None,
-            timeout=None,
-            metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/communicator_objects.UnityToExternalProto/Exchange',
-            mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.UnityMessageProto.SerializeToString,
-            mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.UnityMessageProto.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+  rpc_method_handlers = {
+      'Exchange': grpc.unary_unary_rpc_method_handler(
+          servicer.Exchange,
+          request_deserializer=mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.UnityMessageProto.FromString,
+          response_serializer=mlagents__envs_dot_communicator__objects_dot_unity__message__pb2.UnityMessageProto.SerializeToString,
+      ),
+  }
+  generic_handler = grpc.method_handlers_generic_handler(
+      'communicator_objects.UnityToExternalProto', rpc_method_handlers)
+  server.add_generic_rpc_handlers((generic_handler,))