Automated Protos Update (#152)

Co-authored-by: viambot <[email protected]>
Co-authored-by: Naveed Jooma <[email protected]>

Author: 3 people

examples/server/v1/components.py

@@ -472,8 +472,8 @@ async def get_properties(self, extra: Optional[Dict[str, Any]] = None, **kwargs)
     async def stop(self, extra: Optional[Dict[str, Any]] = None, **kwargs):
         await self.set_power(0)
 
-    async def is_powered(self, extra: Optional[Dict[str, Any]] = None, **kwargs) -> bool:
-        return self.powered
+    async def is_powered(self, extra: Optional[Dict[str, Any]] = None, **kwargs) -> Tuple[bool, float]:
+        return self.powered, self.power
 
     async def is_moving(self):
         return self.powered

src/viam/components/arm/__init__.py

@@ -1,3 +1,4 @@
+import asyncio
 from viam.proto.component.arm import Status as ArmStatus
 from viam.proto.robot import Status
 from viam.registry import ComponentRegistration, Registry
@@ -16,10 +17,15 @@
 
 
 async def create_status(component: Arm) -> Status:
+    (end_position, joint_positions, is_moving,) = await asyncio.gather(
+        component.get_end_position(),
+        component.get_joint_positions(),
+        component.is_moving(),
+    )
     s = ArmStatus(
-        end_position=await component.get_end_position(),
-        joint_positions=await component.get_joint_positions(),
-        is_moving=await component.is_moving(),
+        end_position=end_position,
+        joint_positions=joint_positions,
+        is_moving=is_moving,
     )
     return Status(name=Arm.get_resource_name(component.name), status=message_to_struct(s))
 

src/viam/components/gantry/__init__.py

@@ -1,3 +1,4 @@
+import asyncio
 from viam.proto.component.gantry import Status as GantryStatus
 from viam.proto.robot import Status
 from viam.registry import ComponentRegistration, Registry
@@ -13,9 +14,8 @@
 
 
 async def create_status(component: Gantry) -> Status:
-    s = GantryStatus(
-        positions_mm=await component.get_position(), lengths_mm=await component.get_lengths(), is_moving=await component.is_moving()
-    )
+    (positions_mm, lengths_mm, is_moving) = await asyncio.gather(component.get_position(), component.get_lengths(), component.is_moving())
+    s = GantryStatus(positions_mm=positions_mm, lengths_mm=lengths_mm, is_moving=is_moving)
     return Status(name=Gantry.get_resource_name(component.name), status=message_to_struct(s))
 
 

src/viam/components/motor/__init__.py

@@ -1,3 +1,4 @@
+import asyncio
 from viam.proto.component.motor import Status as MotorStatus
 from viam.proto.robot import Status
 from viam.registry import ComponentRegistration, Registry
@@ -13,11 +14,17 @@
 
 
 async def create_status(component: Motor) -> Status:
+    ((is_powered, _), position, properties, is_moving) = await asyncio.gather(
+        component.is_powered(),
+        component.get_position(),
+        component.get_properties(),
+        component.is_moving(),
+    )
     s = MotorStatus(
-        is_powered=await component.is_powered(),
-        position=await component.get_position(),
-        position_reporting=(await component.get_properties()).position_reporting,
-        is_moving=await component.is_moving(),
+        is_powered=is_powered,
+        position=position,
+        position_reporting=properties.position_reporting,
+        is_moving=is_moving,
     )
     return Status(name=Motor.get_resource_name(component.name), status=message_to_struct(s))
 

src/viam/components/motor/client.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Tuple
 
 from grpclib.client import Channel
 from viam.components.generic.client import do_command
@@ -75,12 +75,12 @@ async def stop(self, extra: Optional[Dict[str, Any]] = None):
         request = StopRequest(name=self.name, extra=dict_to_struct(extra))
         await self.client.Stop(request)
 
-    async def is_powered(self, extra: Optional[Dict[str, Any]] = None) -> bool:
+    async def is_powered(self, extra: Optional[Dict[str, Any]] = None) -> Tuple[bool, float]:
         if extra is None:
             extra = {}
         request = IsPoweredRequest(name=self.name, extra=dict_to_struct(extra))
         response: IsPoweredResponse = await self.client.IsPowered(request)
-        return response.is_on
+        return response.is_on, response.power_pct
 
     async def do_command(self, command: Dict[str, Any]) -> Dict[str, Any]:
         return await do_command(self.channel, self.name, command)

src/viam/components/motor/motor.py

@@ -1,6 +1,6 @@
 import abc
 from dataclasses import dataclass
-from typing import Any, Dict, Optional
+from typing import Any, Dict, Optional, Tuple
 
 from viam.errors import NotSupportedError
 
@@ -102,12 +102,13 @@ async def stop(self, extra: Optional[Dict[str, Any]] = None, **kwargs):
         ...
 
     @abc.abstractmethod
-    async def is_powered(self, extra: Optional[Dict[str, Any]] = None, **kwargs) -> bool:
+    async def is_powered(self, extra: Optional[Dict[str, Any]] = None, **kwargs) -> Tuple[bool, float]:
         """
         Returns whether or not the motor is currently running.
 
         Returns:
             bool: Indicates whether the motor is currently powered.
+            float: The current power percentage of the motor
         """
         ...
 

src/viam/components/motor/service.py

@@ -119,5 +119,5 @@ async def IsPowered(self, stream: Stream[IsPoweredRequest, IsPoweredResponse]) -
             motor = self.get_component(name)
         except ComponentNotFoundError as e:
             raise e.grpc_error
-        is_powered = await motor.is_powered(struct_to_dict(request.extra))
-        await stream.send_message(IsPoweredResponse(is_on=is_powered))
+        is_powered, power_pct = await motor.is_powered(struct_to_dict(request.extra))
+        await stream.send_message(IsPoweredResponse(is_on=is_powered, power_pct=power_pct))

src/viam/components/servo/__init__.py

@@ -1,3 +1,4 @@
+import asyncio
 from viam.proto.component.servo import Status as ServoStatus
 from viam.proto.robot import Status
 from viam.registry import ComponentRegistration, Registry
@@ -14,7 +15,8 @@
 
 
 async def create_status(component: Servo) -> Status:
-    s = ServoStatus(position_deg=await component.get_position(), is_moving=await component.is_moving())
+    (position_deg, is_moving) = await asyncio.gather(component.get_position(), component.is_moving())
+    s = ServoStatus(position_deg=position_deg, is_moving=is_moving)
     return Status(name=Servo.get_resource_name(component.name), status=message_to_struct(s))
 
 

src/viam/gen/app/data/v1/data_pb2.py

@@ -7,7 +7,7 @@
 from google.protobuf import any_pb2 as google_dot_protobuf_dot_any__pb2
 from google.protobuf import struct_pb2 as google_dot_protobuf_dot_struct__pb2
 from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16app/data/v1/data.proto\x12\x10viam.app.data.v1\x1a\x19google/protobuf/any.proto\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1fgoogle/protobuf/timestamp.proto"i\n\x0bDataRequest\x120\n\x06filter\x18\x01 \x01(\x0b2\x18.viam.app.data.v1.FilterR\x06filter\x12\x12\n\x04skip\x18\x02 \x01(\x05R\x04skip\x12\x14\n\x05limit\x18\x03 \x01(\x05R\x05limit"\xaf\x03\n\x06Filter\x12%\n\x0ecomponent_name\x18\x01 \x01(\tR\rcomponentName\x12%\n\x0ecomponent_type\x18\x02 \x01(\tR\rcomponentType\x12\'\n\x0fcomponent_model\x18\x03 \x01(\tR\x0ecomponentModel\x12\x16\n\x06method\x18\x04 \x01(\tR\x06method\x12\x12\n\x04tags\x18\x05 \x03(\tR\x04tags\x12\x1d\n\nrobot_name\x18\x06 \x01(\tR\trobotName\x12\x19\n\x08robot_id\x18\x07 \x01(\tR\x07robotId\x12\x1b\n\tpart_name\x18\x08 \x01(\tR\x08partName\x12\x17\n\x07part_id\x18\t \x01(\tR\x06partId\x12\x1f\n\x0blocation_id\x18\n \x01(\tR\nlocationId\x12\x15\n\x06org_id\x18\x0b \x01(\tR\x05orgId\x12\x1b\n\tmime_type\x18\x0c \x03(\tR\x08mimeType\x12=\n\x08interval\x18\r \x01(\x0b2!.viam.app.data.v1.CaptureIntervalR\x08interval"\xac\x04\n\x0fCaptureMetadata\x12\x1f\n\x0blocation_id\x18\x01 \x01(\tR\nlocationId\x12\x1d\n\nrobot_name\x18\x02 \x01(\tR\trobotName\x12\x19\n\x08robot_id\x18\x03 \x01(\tR\x07robotId\x12\x1b\n\tpart_name\x18\x04 \x01(\tR\x08partName\x12\x17\n\x07part_id\x18\x05 \x01(\tR\x06partId\x12%\n\x0ecomponent_type\x18\x06 \x01(\tR\rcomponentType\x12\'\n\x0fcomponent_model\x18\x07 \x01(\tR\x0ecomponentModel\x12%\n\x0ecomponent_name\x18\x08 \x01(\tR\rcomponentName\x12\x1f\n\x0bmethod_name\x18\t \x01(\tR\nmethodName\x12d\n\x11method_parameters\x18\n \x03(\x0b27.viam.app.data.v1.CaptureMetadata.MethodParametersEntryR\x10methodParameters\x12\x12\n\x04tags\x18\x0b \x03(\tR\x04tags\x12\x1b\n\tmime_type\x18\x0c \x01(\tR\x08mimeType\x1aY\n\x15MethodParametersEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12*\n\x05value\x18\x02 \x01(\x0b2\x14.google.protobuf.AnyR\x05value:\x028\x01"q\n\x0fCaptureInterval\x120\n\x05start\x18\x01 \x01(\x0b2\x1a.google.protobuf.TimestampR\x05start\x12,\n\x03end\x18\x02 \x01(\x0b2\x1a.google.protobuf.TimestampR\x03end"}\n\x1aTabularDataByFilterRequest\x12@\n\x0cdata_request\x18\x01 \x01(\x0b2\x1d.viam.app.data.v1.DataRequestR\x0bdataRequest\x12\x1d\n\ncount_only\x18\x02 \x01(\x08R\tcountOnly"\xa5\x01\n\x1bTabularDataByFilterResponse\x12=\n\x08metadata\x18\x01 \x03(\x0b2!.viam.app.data.v1.CaptureMetadataR\x08metadata\x121\n\x04data\x18\x02 \x03(\x0b2\x1d.viam.app.data.v1.TabularDataR\x04data\x12\x14\n\x05count\x18\x03 \x01(\x03R\x05count"\xe5\x01\n\x0bTabularData\x12+\n\x04data\x18\x01 \x01(\x0b2\x17.google.protobuf.StructR\x04data\x12%\n\x0emetadata_index\x18\x02 \x01(\x05R\rmetadataIndex\x12A\n\x0etime_requested\x18\x03 \x01(\x0b2\x1a.google.protobuf.TimestampR\rtimeRequested\x12?\n\rtime_received\x18\x04 \x01(\x0b2\x1a.google.protobuf.TimestampR\x0ctimeReceived"\xf1\x01\n\nBinaryData\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12\x10\n\x03uri\x18\x02 \x01(\tR\x03uri\x12\x16\n\x06binary\x18\x03 \x01(\x0cR\x06binary\x12%\n\x0emetadata_index\x18\x04 \x01(\x05R\rmetadataIndex\x12A\n\x0etime_requested\x18\x05 \x01(\x0b2\x1a.google.protobuf.TimestampR\rtimeRequested\x12?\n\rtime_received\x18\x06 \x01(\x0b2\x1a.google.protobuf.TimestampR\x0ctimeReceived"\xa3\x01\n\x19BinaryDataByFilterRequest\x12@\n\x0cdata_request\x18\x01 \x01(\x0b2\x1d.viam.app.data.v1.DataRequestR\x0bdataRequest\x12%\n\x0einclude_binary\x18\x02 \x01(\x08R\rincludeBinary\x12\x1d\n\ncount_only\x18\x03 \x01(\x08R\tcountOnly"\xa3\x01\n\x1aBinaryDataByFilterResponse\x12=\n\x08metadata\x18\x01 \x03(\x0b2!.viam.app.data.v1.CaptureMetadataR\x08metadata\x120\n\x04data\x18\x02 \x03(\x0b2\x1c.viam.app.data.v1.BinaryDataR\x04data\x12\x14\n\x05count\x18\x03 \x01(\x03R\x05count"Z\n\x16BinaryDataByIDsRequest\x12\x19\n\x08file_ids\x18\x01 \x03(\tR\x07fileIds\x12%\n\x0einclude_binary\x18\x02 \x01(\x08R\rincludeBinary"\xa0\x01\n\x17BinaryDataByIDsResponse\x12=\n\x08metadata\x18\x01 \x03(\x0b2!.viam.app.data.v1.CaptureMetadataR\x08metadata\x120\n\x04data\x18\x02 \x03(\x0b2\x1c.viam.app.data.v1.BinaryDataR\x04data\x12\x14\n\x05count\x18\x03 \x01(\x03R\x05count2\xda\x02\n\x0bDataService\x12r\n\x13TabularDataByFilter\x12,.viam.app.data.v1.TabularDataByFilterRequest\x1a-.viam.app.data.v1.TabularDataByFilterResponse\x12o\n\x12BinaryDataByFilter\x12+.viam.app.data.v1.BinaryDataByFilterRequest\x1a,.viam.app.data.v1.BinaryDataByFilterResponse\x12f\n\x0fBinaryDataByIDs\x12(.viam.app.data.v1.BinaryDataByIDsRequest\x1a).viam.app.data.v1.BinaryDataByIDsResponseB\x1dZ\x1bgo.viam.com/api/app/data/v1b\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x16app/data/v1/data.proto\x12\x10viam.app.data.v1\x1a\x19google/protobuf/any.proto\x1a\x1cgoogle/protobuf/struct.proto\x1a\x1fgoogle/protobuf/timestamp.proto"i\n\x0bDataRequest\x120\n\x06filter\x18\x01 \x01(\x0b2\x18.viam.app.data.v1.FilterR\x06filter\x12\x12\n\x04skip\x18\x02 \x01(\x03R\x04skip\x12\x14\n\x05limit\x18\x03 \x01(\x03R\x05limit"\xb1\x03\n\x06Filter\x12%\n\x0ecomponent_name\x18\x01 \x01(\tR\rcomponentName\x12%\n\x0ecomponent_type\x18\x02 \x01(\tR\rcomponentType\x12\'\n\x0fcomponent_model\x18\x03 \x01(\tR\x0ecomponentModel\x12\x16\n\x06method\x18\x04 \x01(\tR\x06method\x12\x12\n\x04tags\x18\x05 \x03(\tR\x04tags\x12\x1d\n\nrobot_name\x18\x06 \x01(\tR\trobotName\x12\x19\n\x08robot_id\x18\x07 \x01(\tR\x07robotId\x12\x1b\n\tpart_name\x18\x08 \x01(\tR\x08partName\x12\x17\n\x07part_id\x18\t \x01(\tR\x06partId\x12\x1f\n\x0blocation_id\x18\n \x01(\tR\nlocationId\x12\x17\n\x07org_ids\x18\x0b \x03(\tR\x06orgIds\x12\x1b\n\tmime_type\x18\x0c \x03(\tR\x08mimeType\x12=\n\x08interval\x18\r \x01(\x0b2!.viam.app.data.v1.CaptureIntervalR\x08interval"\xc3\x04\n\x0fCaptureMetadata\x12\x15\n\x06org_id\x18\x01 \x01(\tR\x05orgId\x12\x1f\n\x0blocation_id\x18\x02 \x01(\tR\nlocationId\x12\x1d\n\nrobot_name\x18\x03 \x01(\tR\trobotName\x12\x19\n\x08robot_id\x18\x04 \x01(\tR\x07robotId\x12\x1b\n\tpart_name\x18\x05 \x01(\tR\x08partName\x12\x17\n\x07part_id\x18\x06 \x01(\tR\x06partId\x12%\n\x0ecomponent_type\x18\x07 \x01(\tR\rcomponentType\x12\'\n\x0fcomponent_model\x18\x08 \x01(\tR\x0ecomponentModel\x12%\n\x0ecomponent_name\x18\t \x01(\tR\rcomponentName\x12\x1f\n\x0bmethod_name\x18\n \x01(\tR\nmethodName\x12d\n\x11method_parameters\x18\x0b \x03(\x0b27.viam.app.data.v1.CaptureMetadata.MethodParametersEntryR\x10methodParameters\x12\x12\n\x04tags\x18\x0c \x03(\tR\x04tags\x12\x1b\n\tmime_type\x18\r \x01(\tR\x08mimeType\x1aY\n\x15MethodParametersEntry\x12\x10\n\x03key\x18\x01 \x01(\tR\x03key\x12*\n\x05value\x18\x02 \x01(\x0b2\x14.google.protobuf.AnyR\x05value:\x028\x01"q\n\x0fCaptureInterval\x120\n\x05start\x18\x01 \x01(\x0b2\x1a.google.protobuf.TimestampR\x05start\x12,\n\x03end\x18\x02 \x01(\x0b2\x1a.google.protobuf.TimestampR\x03end"}\n\x1aTabularDataByFilterRequest\x12@\n\x0cdata_request\x18\x01 \x01(\x0b2\x1d.viam.app.data.v1.DataRequestR\x0bdataRequest\x12\x1d\n\ncount_only\x18\x02 \x01(\x08R\tcountOnly"\xa5\x01\n\x1bTabularDataByFilterResponse\x12=\n\x08metadata\x18\x01 \x03(\x0b2!.viam.app.data.v1.CaptureMetadataR\x08metadata\x121\n\x04data\x18\x02 \x03(\x0b2\x1d.viam.app.data.v1.TabularDataR\x04data\x12\x14\n\x05count\x18\x03 \x01(\x03R\x05count"\xe5\x01\n\x0bTabularData\x12+\n\x04data\x18\x01 \x01(\x0b2\x17.google.protobuf.StructR\x04data\x12%\n\x0emetadata_index\x18\x02 \x01(\x05R\rmetadataIndex\x12A\n\x0etime_requested\x18\x03 \x01(\x0b2\x1a.google.protobuf.TimestampR\rtimeRequested\x12?\n\rtime_received\x18\x04 \x01(\x0b2\x1a.google.protobuf.TimestampR\x0ctimeReceived"b\n\nBinaryData\x12\x16\n\x06binary\x18\x01 \x01(\x0cR\x06binary\x12<\n\x08metadata\x18\x02 \x01(\x0b2 .viam.app.data.v1.BinaryMetadataR\x08metadata"\xa3\x01\n\x19BinaryDataByFilterRequest\x12@\n\x0cdata_request\x18\x01 \x01(\x0b2\x1d.viam.app.data.v1.DataRequestR\x0bdataRequest\x12%\n\x0einclude_binary\x18\x02 \x01(\x08R\rincludeBinary\x12\x1d\n\ncount_only\x18\x03 \x01(\x08R\tcountOnly"d\n\x1aBinaryDataByFilterResponse\x120\n\x04data\x18\x01 \x03(\x0b2\x1c.viam.app.data.v1.BinaryDataR\x04data\x12\x14\n\x05count\x18\x02 \x01(\x03R\x05count"Z\n\x16BinaryDataByIDsRequest\x12\x19\n\x08file_ids\x18\x01 \x03(\tR\x07fileIds\x12%\n\x0einclude_binary\x18\x02 \x01(\x08R\rincludeBinary"a\n\x17BinaryDataByIDsResponse\x120\n\x04data\x18\x01 \x03(\x0b2\x1c.viam.app.data.v1.BinaryDataR\x04data\x12\x14\n\x05count\x18\x02 \x01(\x03R\x05count"\xbc\x02\n\x0eBinaryMetadata\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id\x12L\n\x10capture_metadata\x18\x02 \x01(\x0b2!.viam.app.data.v1.CaptureMetadataR\x0fcaptureMetadata\x12A\n\x0etime_requested\x18\x03 \x01(\x0b2\x1a.google.protobuf.TimestampR\rtimeRequested\x12?\n\rtime_received\x18\x04 \x01(\x0b2\x1a.google.protobuf.TimestampR\x0ctimeReceived\x12\x1b\n\tfile_name\x18\x05 \x01(\tR\x08fileName\x12\x19\n\x08file_ext\x18\x06 \x01(\tR\x07fileExt\x12\x10\n\x03uri\x18\x07 \x01(\tR\x03uri2\xda\x02\n\x0bDataService\x12r\n\x13TabularDataByFilter\x12,.viam.app.data.v1.TabularDataByFilterRequest\x1a-.viam.app.data.v1.TabularDataByFilterResponse\x12o\n\x12BinaryDataByFilter\x12+.viam.app.data.v1.BinaryDataByFilterRequest\x1a,.viam.app.data.v1.BinaryDataByFilterResponse\x12f\n\x0fBinaryDataByIDs\x12(.viam.app.data.v1.BinaryDataByIDsRequest\x1a).viam.app.data.v1.BinaryDataByIDsResponseB\x1dZ\x1bgo.viam.com/api/app/data/v1b\x06proto3')
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
 _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'app.data.v1.data_pb2', globals())
 if _descriptor._USE_C_DESCRIPTORS == False:
@@ -18,28 +18,30 @@
     _DATAREQUEST._serialized_start = 134
     _DATAREQUEST._serialized_end = 239
     _FILTER._serialized_start = 242
-    _FILTER._serialized_end = 673
-    _CAPTUREMETADATA._serialized_start = 676
-    _CAPTUREMETADATA._serialized_end = 1232
-    _CAPTUREMETADATA_METHODPARAMETERSENTRY._serialized_start = 1143
-    _CAPTUREMETADATA_METHODPARAMETERSENTRY._serialized_end = 1232
-    _CAPTUREINTERVAL._serialized_start = 1234
-    _CAPTUREINTERVAL._serialized_end = 1347
-    _TABULARDATABYFILTERREQUEST._serialized_start = 1349
-    _TABULARDATABYFILTERREQUEST._serialized_end = 1474
-    _TABULARDATABYFILTERRESPONSE._serialized_start = 1477
-    _TABULARDATABYFILTERRESPONSE._serialized_end = 1642
-    _TABULARDATA._serialized_start = 1645
-    _TABULARDATA._serialized_end = 1874
-    _BINARYDATA._serialized_start = 1877
-    _BINARYDATA._serialized_end = 2118
-    _BINARYDATABYFILTERREQUEST._serialized_start = 2121
-    _BINARYDATABYFILTERREQUEST._serialized_end = 2284
-    _BINARYDATABYFILTERRESPONSE._serialized_start = 2287
-    _BINARYDATABYFILTERRESPONSE._serialized_end = 2450
-    _BINARYDATABYIDSREQUEST._serialized_start = 2452
-    _BINARYDATABYIDSREQUEST._serialized_end = 2542
-    _BINARYDATABYIDSRESPONSE._serialized_start = 2545
-    _BINARYDATABYIDSRESPONSE._serialized_end = 2705
-    _DATASERVICE._serialized_start = 2708
-    _DATASERVICE._serialized_end = 3054
+    _FILTER._serialized_end = 675
+    _CAPTUREMETADATA._serialized_start = 678
+    _CAPTUREMETADATA._serialized_end = 1257
+    _CAPTUREMETADATA_METHODPARAMETERSENTRY._serialized_start = 1168
+    _CAPTUREMETADATA_METHODPARAMETERSENTRY._serialized_end = 1257
+    _CAPTUREINTERVAL._serialized_start = 1259
+    _CAPTUREINTERVAL._serialized_end = 1372
+    _TABULARDATABYFILTERREQUEST._serialized_start = 1374
+    _TABULARDATABYFILTERREQUEST._serialized_end = 1499
+    _TABULARDATABYFILTERRESPONSE._serialized_start = 1502
+    _TABULARDATABYFILTERRESPONSE._serialized_end = 1667
+    _TABULARDATA._serialized_start = 1670
+    _TABULARDATA._serialized_end = 1899
+    _BINARYDATA._serialized_start = 1901
+    _BINARYDATA._serialized_end = 1999
+    _BINARYDATABYFILTERREQUEST._serialized_start = 2002
+    _BINARYDATABYFILTERREQUEST._serialized_end = 2165
+    _BINARYDATABYFILTERRESPONSE._serialized_start = 2167
+    _BINARYDATABYFILTERRESPONSE._serialized_end = 2267
+    _BINARYDATABYIDSREQUEST._serialized_start = 2269
+    _BINARYDATABYIDSREQUEST._serialized_end = 2359
+    _BINARYDATABYIDSRESPONSE._serialized_start = 2361
+    _BINARYDATABYIDSRESPONSE._serialized_end = 2458
+    _BINARYMETADATA._serialized_start = 2461
+    _BINARYMETADATA._serialized_end = 2777
+    _DATASERVICE._serialized_start = 2780
+    _DATASERVICE._serialized_end = 3126