diff --git a/.yamato/protobuf-generation-test.yml b/.yamato/protobuf-generation-test.yml index 749725e10bb..0572b31db05 100644 --- a/.yamato/protobuf-generation-test.yml +++ b/.yamato/protobuf-generation-test.yml @@ -14,7 +14,7 @@ test_linux_protobuf_generation: conda activate python3.10 nuget install Grpc.Tools -Version $GRPC_VERSION -OutputDirectory protobuf-definitions/ python3 -m pip install --upgrade pip --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple - python3 -m pip install grpcio==1.28.1 grpcio-tools==1.13.0 protobuf==3.11.3 six==1.14.0 mypy-protobuf==1.16.0 --progress-bar=off --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple + python3 -m pip install grpcio==1.48.2 grpcio-tools==1.48.2 protobuf==3.19.6 six==1.16.0 mypy-protobuf==1.16.0 --progress-bar=off --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple 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 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentAction.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentAction.cs.meta index f47d94375b5..fed1ad71956 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentAction.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentAction.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b1fa94db54b734224927bb4b322227cd +guid: 80c01eada869187a68f911a90559b222 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentInfo.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentInfo.cs.meta index 07ed3614561..bc1ed199d65 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentInfo.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentInfo.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ecaddd3a8141a4854a4d2c7fe8bd6a75 +guid: 15c5870f211b6eb578aff1d41e760e33 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentInfoActionPair.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentInfoActionPair.cs.meta index 7474dcae69c..0ee8c86cef5 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentInfoActionPair.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/AgentInfoActionPair.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 29577366657494c678558b0643abcb30 +guid: 81f28410200684f6ea0653dd60bcadde MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/BrainParameters.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/BrainParameters.cs.meta index 447602fcc2a..ebbea500b23 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/BrainParameters.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/BrainParameters.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 26f9a93df956e4ee88c1cf5f31017f0e +guid: a490aadad842ec18a801c87f687753cc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Capabilities.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Capabilities.cs.meta index 1e65cf6ee30..11112b8196a 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Capabilities.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Capabilities.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e8388443b440343299cab2e88988e14e +guid: 317d82137f77231cb972da65f03e3413 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Command.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Command.cs.meta index f47033a7c17..ee4971371dc 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Command.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Command.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9be6f5025f61540eabbc831436642adc +guid: b7a34a647907b741cb811db221dd4a50 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/CustomResetParameters.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/CustomResetParameters.cs.meta index aa357195f6f..fb6d1ca9b0a 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/CustomResetParameters.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/CustomResetParameters.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 62f03717ee98042bf8990733358f2dbd +guid: f3844b26633748da288813e0b188e5d2 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/DemonstrationMeta.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/DemonstrationMeta.cs.meta index 41176197e92..09e069782b4 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/DemonstrationMeta.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/DemonstrationMeta.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7248e2660150f4a39bb99dfabb9bae7d +guid: f38cb6de76b08f3628aef01e868b8c83 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/EngineConfiguration.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/EngineConfiguration.cs.meta index cb08edae856..b6a57404447 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/EngineConfiguration.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/EngineConfiguration.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 129a5bbec69fc4f42bc70e422660c8f0 +guid: e75a15b8044215822b48096b0f166ebc MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Header.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Header.cs.meta index 3084742c956..8906e7788c1 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Header.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Header.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 870996bd75a1a4fbcbb120b1e1e66c37 +guid: 7a75a9dc079184c6f95bfce5796bed6a MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Observation.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Observation.cs.meta index 971fead69c4..bb317b4f53d 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Observation.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/Observation.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9fbba5f80821d4f02b4239a8e16eebfa +guid: 48ae6e9b157e9459aaddf06b2bfa635e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/SpaceType.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/SpaceType.cs.meta index 7b6ada73eaf..4ca81201e47 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/SpaceType.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/SpaceType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3934602aadbe9471ca973685059ef04a +guid: a5bca0b650ad3a1b691ab897aead0992 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/TrainingAnalytics.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/TrainingAnalytics.cs.meta index 8e9d358feba..63f6b846151 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/TrainingAnalytics.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/TrainingAnalytics.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9e6ac06a3931742d798cf922de6b99f0 +guid: 9949df411f7112bb290948f924e4c603 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityInput.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityInput.cs.meta index 32f1aa8334a..8536ecf4542 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityInput.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityInput.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 13de5026cc0834f558fe971eb93c850e +guid: a8d4dc8cdf550eb73985950c44005129 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityMessage.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityMessage.cs.meta index fe03de4e4ff..c0a6e877e1b 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityMessage.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityMessage.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e2189c32296994576b0ef0aaa2b78142 +guid: 19ea61033da502944a801b346773c997 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityOutput.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityOutput.cs.meta index e1ae7344594..2a74abca8f4 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityOutput.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityOutput.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e1c19e75c7657497fbc05cfa40dd6783 +guid: 2fc7b7cfc6756c7b89b9ffc76b43044e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInitializationInput.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInitializationInput.cs.meta index c0c9fc2fd42..3f6574ca279 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInitializationInput.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInitializationInput.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e1542ad34ffb34317b74b239135d0477 +guid: 0285bf3c40a0306478872a6c1a102a32 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInitializationOutput.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInitializationOutput.cs.meta index bbc4dba7c4c..3b3483a2302 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInitializationOutput.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInitializationOutput.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e0bcb88495d5d48229140a2080dfd297 +guid: da7618a33d91c8465853931bac585a28 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInput.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInput.cs.meta index c2e8eb03e97..48764a083a7 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInput.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlInput.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c9d247f0bc49d468da0f9f0cc6484d34 +guid: c362823bb03fe67bebb658fc15c20a16 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlOutput.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlOutput.cs.meta index d2607bf220c..132cdb7d016 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlOutput.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityRlOutput.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7b039d6d52b5142a78431d1758f5bf53 +guid: f9ffb439650bd735c99f147b10983e7d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityToExternal.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityToExternal.cs.meta index e8ad13fd02d..50c400f3453 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityToExternal.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityToExternal.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: c03819ddc4c30416ab6ecc83c9cee562 +guid: 563289b104fd9d5aebb58ed13c27886d MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityToExternalGrpc.cs.meta b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityToExternalGrpc.cs.meta index 620a3f1d448..be77e859a82 100644 --- a/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityToExternalGrpc.cs.meta +++ b/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects/UnityToExternalGrpc.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6c0f560328e7343499ad203c75c11741 +guid: c70e1dc097d19976f9d81f8386efa7da MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/ml-agents-envs/mlagents_envs/communicator_objects/unity_to_external_pb2.py b/ml-agents-envs/mlagents_envs/communicator_objects/unity_to_external_pb2.py index 6053ccc46a4..030f333b20a 100644 --- a/ml-agents-envs/mlagents_envs/communicator_objects/unity_to_external_pb2.py +++ b/ml-agents-envs/mlagents_envs/communicator_objects/unity_to_external_pb2.py @@ -1,13 +1,12 @@ +# -*- coding: utf-8 -*- # Generated by the protocol buffer compiler. DO NOT EDIT! # source: mlagents_envs/communicator_objects/unity_to_external.proto - -import sys -_b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1')) +"""Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor +from google.protobuf import descriptor_pool as _descriptor_pool from google.protobuf import message as _message from google.protobuf import reflection as _reflection from google.protobuf import symbol_database as _symbol_database -from google.protobuf import descriptor_pb2 # @@protoc_insertion_point(imports) _sym_db = _symbol_database.Default() @@ -16,43 +15,15 @@ from mlagents_envs.communicator_objects import unity_message_pb2 as mlagents__envs_dot_communicator__objects_dot_unity__message__pb2 -DESCRIPTOR = _descriptor.FileDescriptor( - name='mlagents_envs/communicator_objects/unity_to_external.proto', - package='communicator_objects', - syntax='proto3', - 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,]) - - - -_sym_db.RegisterFileDescriptor(DESCRIPTOR) - +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(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') -DESCRIPTOR.has_options = True -DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\252\002\"Unity.MLAgents.CommunicatorObjects')) -_UNITYTOEXTERNALPROTO = _descriptor.ServiceDescriptor( - name='UnityToExternalProto', - full_name='communicator_objects.UnityToExternalProto', - file=DESCRIPTOR, - index=0, - options=None, - serialized_start=140, - serialized_end=258, - methods=[ - _descriptor.MethodDescriptor( - name='Exchange', - full_name='communicator_objects.UnityToExternalProto.Exchange', - index=0, - 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, - options=None, - ), -]) -_sym_db.RegisterServiceDescriptor(_UNITYTOEXTERNALPROTO) -DESCRIPTOR.services_by_name['UnityToExternalProto'] = _UNITYTOEXTERNALPROTO +_UNITYTOEXTERNALPROTO = DESCRIPTOR.services_by_name['UnityToExternalProto'] +if _descriptor._USE_C_DESCRIPTORS == False: + DESCRIPTOR._options = None + DESCRIPTOR._serialized_options = b'\252\002\"Unity.MLAgents.CommunicatorObjects' + _UNITYTOEXTERNALPROTO._serialized_start=140 + _UNITYTOEXTERNALPROTO._serialized_end=258 # @@protoc_insertion_point(module_scope) diff --git a/ml-agents-envs/mlagents_envs/communicator_objects/unity_to_external_pb2_grpc.py b/ml-agents-envs/mlagents_envs/communicator_objects/unity_to_external_pb2_grpc.py index bedeb100594..966001f1451 100644 --- a/ml-agents-envs/mlagents_envs/communicator_objects/unity_to_external_pb2_grpc.py +++ b/ml-agents-envs/mlagents_envs/communicator_objects/unity_to_external_pb2_grpc.py @@ -1,46 +1,67 @@ # 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 class UnityToExternalProtoStub(object): - # missing associated documentation comment in .proto file - pass + """Missing associated documentation comment in .proto file.""" - 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, + ) class UnityToExternalProtoServicer(object): - # missing associated documentation comment in .proto file - pass + """Missing associated documentation comment in .proto file.""" - 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!') def add_UnityToExternalProtoServicer_to_server(servicer, server): - 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,)) + 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) diff --git a/ml-agents-envs/setup.py b/ml-agents-envs/setup.py index 04e48163e2f..b1b13659cfb 100644 --- a/ml-agents-envs/setup.py +++ b/ml-agents-envs/setup.py @@ -48,7 +48,7 @@ def run(self): zip_safe=False, install_requires=[ "cloudpickle", - "grpcio>=1.11.0", + "grpcio>=1.11.0,<=1.48.2", "Pillow>=4.2.1", "protobuf>=3.6,<3.20", "pyyaml>=3.1.0", diff --git a/ml-agents/setup.py b/ml-agents/setup.py index bcab8b4ea38..f77374d07de 100644 --- a/ml-agents/setup.py +++ b/ml-agents/setup.py @@ -55,7 +55,7 @@ def run(self): zip_safe=False, install_requires=[ # Test-only dependencies should go in test_requirements.txt, not here. - "grpcio>=1.11.0", + "grpcio>=1.11.0,<=1.48.2", "h5py>=2.9.0", f"mlagents_envs=={VERSION}", "numpy>=1.13.3,<2.0", diff --git a/protobuf-definitions/README.md b/protobuf-definitions/README.md index ed5a322d4fe..ed793341a0f 100644 --- a/protobuf-definitions/README.md +++ b/protobuf-definitions/README.md @@ -4,8 +4,8 @@ Contains relevant definitions needed to generate probobuf files used in [ML-Agen ## Requirements -* protobuf 3.6.0 -* grpcio-tools 1.11.1 +* protobuf 3.19.6 +* grpcio-tools 1.48.2 * Grpc.Tools 1.14.1 ## Set-up & Installation @@ -14,9 +14,9 @@ First we will follow these steps once install protobuf and grpcio-tools via your Assume the ml-agents repository is checked out to a folder named $MLAGENTS_ROOT. **Note:** If you're using Anaconda, don't forget to activate the ml-agents environment first. -`pip install protobuf==3.6.0 --force` +`pip install protobuf==3.19.6 --force` -`pip install grpcio-tools==1.11.1` +`pip install grpcio-tools==1.28.1` `pip install mypy-protobuf==1.16.0` @@ -49,7 +49,7 @@ Whenever you change the fields of a message, you must follow the steps below to 5. In the generated `UnityToExternalGrpc.cs` file in the `$MLAGENTS_ROOT/com.unity.ml-agents/Runtime/Grpc/CommunicatorObjects` folder, check to see if you need to add the following to the beginning of the file: ```csharp -# if UNITY_EDITOR || UNITY_STANDALONE_WIN || UNITY_STANDALONE_OSX || UNITY_STANDALONE_LINUX +# if UNITY_EDITOR || UNITY_STANDALONE ``` and the following line to the end