Skip to content

Commit f17e252

Browse files
viambotviambot
authored
Automated Protos Update (#933)
1 parent ba2c70c commit f17e252

File tree

16 files changed

+1047
-766
lines changed

16 files changed

+1047
-766
lines changed

‎src/viam/components/gripper/client.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
GrabRequest,
88
GrabResponse,
99
GripperServiceStub,
10+
IsHoldingSomethingRequest,
11+
IsHoldingSomethingResponse,
1012
IsMovingRequest,
1113
IsMovingResponse,
1214
OpenRequest,
1315
StopRequest,
14-
IsHoldingSomethingRequest,
15-
IsHoldingSomethingResponse
1616
)
1717
from viam.resource.rpc_client_base import ReconfigurableResourceRPCClientBase
1818
from viam.utils import ValueTypes, dict_to_struct, get_geometries, struct_to_dict
@@ -66,11 +66,7 @@ async def stop(
6666
await self.client.Stop(request, timeout=timeout, metadata=md)
6767

6868
async def is_holding_something(
69-
self,
70-
*,
71-
extra: Optional[Dict[str, Any]] = None,
72-
timeout: Optional[float] = None,
73-
**kwargs
69+
self, *, extra: Optional[Dict[str, Any]] = None, timeout: Optional[float] = None, **kwargs
7470
) -> Gripper.HoldingStatus:
7571
md = kwargs.get("metadata", self.Metadata()).proto
7672
request = IsHoldingSomethingRequest(name=self.name, extra=dict_to_struct(extra))

‎src/viam/components/gripper/gripper.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
from . import KinematicsFileFormat
99

10+
1011
class Gripper(ComponentBase):
1112
"""
1213
Gripper represents a physical robotic gripper.
@@ -33,6 +34,7 @@ class HoldingStatus:
3334
additional ``meta`` attribute contains other optional contextual information (i.e. confidence
3435
interval, pressure, etc.)
3536
"""
37+
3638
is_holding_something: bool
3739
meta: Optional[Dict[str, Any]] = None
3840

‎src/viam/components/gripper/service.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
GrabRequest,
1313
GrabResponse,
1414
GripperServiceBase,
15+
IsHoldingSomethingRequest,
16+
IsHoldingSomethingResponse,
1517
IsMovingRequest,
1618
IsMovingResponse,
1719
OpenRequest,
1820
OpenResponse,
1921
StopRequest,
2022
StopResponse,
21-
IsHoldingSomethingRequest,
22-
IsHoldingSomethingResponse
2323
)
2424
from viam.resource.rpc_service_base import ResourceRPCServiceBase
2525
from viam.utils import dict_to_struct, struct_to_dict
@@ -78,7 +78,8 @@ async def IsHoldingSomething(self, stream: Stream[IsHoldingSomethingRequest, IsH
7878
gripper = self.get_resource(name)
7979
holding_status = await gripper.is_holding_something()
8080
response = IsHoldingSomethingResponse(
81-
is_holding_something=holding_status.is_holding_something, meta=dict_to_struct(holding_status.meta))
81+
is_holding_something=holding_status.is_holding_something, meta=dict_to_struct(holding_status.meta)
82+
)
8283
await stream.send_message(response)
8384

8485
async def DoCommand(self, stream: Stream[DoCommandRequest, DoCommandResponse]) -> None:

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

Lines changed: 100 additions & 100 deletions
Large diffs are not rendered by default.

‎src/viam/gen/app/data/v1/data_pb2.pyi

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ class ExportTabularDataRequest(google.protobuf.message.Message):
500500
RESOURCE_SUBTYPE_FIELD_NUMBER: builtins.int
501501
METHOD_NAME_FIELD_NUMBER: builtins.int
502502
INTERVAL_FIELD_NUMBER: builtins.int
503+
ADDITIONAL_PARAMETERS_FIELD_NUMBER: builtins.int
503504
part_id: builtins.str
504505
resource_name: builtins.str
505506
resource_subtype: builtins.str
@@ -509,13 +510,20 @@ class ExportTabularDataRequest(google.protobuf.message.Message):
509510
def interval(self) -> global___CaptureInterval:
510511
...
511512

512-
def __init__(self, *, part_id: builtins.str=..., resource_name: builtins.str=..., resource_subtype: builtins.str=..., method_name: builtins.str=..., interval: global___CaptureInterval | None=...) -> None:
513+
@property
514+
def additional_parameters(self) -> google.protobuf.struct_pb2.Struct:
515+
...
516+
517+
def __init__(self, *, part_id: builtins.str=..., resource_name: builtins.str=..., resource_subtype: builtins.str=..., method_name: builtins.str=..., interval: global___CaptureInterval | None=..., additional_parameters: google.protobuf.struct_pb2.Struct | None=...) -> None:
513518
...
514519

515-
def HasField(self, field_name: typing.Literal['interval', b'interval']) -> builtins.bool:
520+
def HasField(self, field_name: typing.Literal['_additional_parameters', b'_additional_parameters', 'additional_parameters', b'additional_parameters', 'interval', b'interval']) -> builtins.bool:
516521
...
517522

518-
def ClearField(self, field_name: typing.Literal['interval', b'interval', 'method_name', b'method_name', 'part_id', b'part_id', 'resource_name', b'resource_name', 'resource_subtype', b'resource_subtype']) -> None:
523+
def ClearField(self, field_name: typing.Literal['_additional_parameters', b'_additional_parameters', 'additional_parameters', b'additional_parameters', 'interval', b'interval', 'method_name', b'method_name', 'part_id', b'part_id', 'resource_name', b'resource_name', 'resource_subtype', b'resource_subtype']) -> None:
524+
...
525+
526+
def WhichOneof(self, oneof_group: typing.Literal['_additional_parameters', b'_additional_parameters']) -> typing.Literal['additional_parameters'] | None:
519527
...
520528
global___ExportTabularDataRequest = ExportTabularDataRequest
521529

@@ -580,15 +588,26 @@ class GetLatestTabularDataRequest(google.protobuf.message.Message):
580588
RESOURCE_NAME_FIELD_NUMBER: builtins.int
581589
METHOD_NAME_FIELD_NUMBER: builtins.int
582590
RESOURCE_SUBTYPE_FIELD_NUMBER: builtins.int
591+
ADDITIONAL_PARAMETERS_FIELD_NUMBER: builtins.int
583592
part_id: builtins.str
584593
resource_name: builtins.str
585594
method_name: builtins.str
586595
resource_subtype: builtins.str
587596

588-
def __init__(self, *, part_id: builtins.str=..., resource_name: builtins.str=..., method_name: builtins.str=..., resource_subtype: builtins.str=...) -> None:
597+
@property
598+
def additional_parameters(self) -> google.protobuf.struct_pb2.Struct:
599+
...
600+
601+
def __init__(self, *, part_id: builtins.str=..., resource_name: builtins.str=..., method_name: builtins.str=..., resource_subtype: builtins.str=..., additional_parameters: google.protobuf.struct_pb2.Struct | None=...) -> None:
602+
...
603+
604+
def HasField(self, field_name: typing.Literal['_additional_parameters', b'_additional_parameters', 'additional_parameters', b'additional_parameters']) -> builtins.bool:
605+
...
606+
607+
def ClearField(self, field_name: typing.Literal['_additional_parameters', b'_additional_parameters', 'additional_parameters', b'additional_parameters', 'method_name', b'method_name', 'part_id', b'part_id', 'resource_name', b'resource_name', 'resource_subtype', b'resource_subtype']) -> None:
589608
...
590609

591-
def ClearField(self, field_name: typing.Literal['method_name', b'method_name', 'part_id', b'part_id', 'resource_name', b'resource_name', 'resource_subtype', b'resource_subtype']) -> None:
610+
def WhichOneof(self, oneof_group: typing.Literal['_additional_parameters', b'_additional_parameters']) -> typing.Literal['additional_parameters'] | None:
592611
...
593612
global___GetLatestTabularDataRequest = GetLatestTabularDataRequest
594613

‎src/viam/gen/app/v1/app_grpc.py

Lines changed: 10 additions & 2 deletions
Large diffs are not rendered by default.

‎src/viam/gen/app/v1/app_pb2.py

Lines changed: 554 additions & 536 deletions
Large diffs are not rendered by default.

‎src/viam/gen/app/v1/app_pb2.pyi

Lines changed: 186 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -393,6 +393,7 @@ class OrganizationMember(google.protobuf.message.Message):
393393
EMAILS_FIELD_NUMBER: builtins.int
394394
DATE_ADDED_FIELD_NUMBER: builtins.int
395395
LAST_LOGIN_FIELD_NUMBER: builtins.int
396+
LAST_ACCESS_FIELD_NUMBER: builtins.int
396397
user_id: builtins.str
397398

398399
@property
@@ -407,15 +408,24 @@ class OrganizationMember(google.protobuf.message.Message):
407408
def last_login(self) -> google.protobuf.timestamp_pb2.Timestamp:
408409
...
409410

410-
def __init__(self, *, user_id: builtins.str=..., emails: collections.abc.Iterable[builtins.str] | None=..., date_added: google.protobuf.timestamp_pb2.Timestamp | None=..., last_login: google.protobuf.timestamp_pb2.Timestamp | None=...) -> None:
411+
@property
412+
def last_access(self) -> google.protobuf.timestamp_pb2.Timestamp:
411413
...
412414

413-
def HasField(self, field_name: typing.Literal['_last_login', b'_last_login', 'date_added', b'date_added', 'last_login', b'last_login']) -> builtins.bool:
415+
def __init__(self, *, user_id: builtins.str=..., emails: collections.abc.Iterable[builtins.str] | None=..., date_added: google.protobuf.timestamp_pb2.Timestamp | None=..., last_login: google.protobuf.timestamp_pb2.Timestamp | None=..., last_access: google.protobuf.timestamp_pb2.Timestamp | None=...) -> None:
414416
...
415417

416-
def ClearField(self, field_name: typing.Literal['_last_login', b'_last_login', 'date_added', b'date_added', 'emails', b'emails', 'last_login', b'last_login', 'user_id', b'user_id']) -> None:
418+
def HasField(self, field_name: typing.Literal['_last_access', b'_last_access', '_last_login', b'_last_login', 'date_added', b'date_added', 'last_access', b'last_access', 'last_login', b'last_login']) -> builtins.bool:
417419
...
418420

421+
def ClearField(self, field_name: typing.Literal['_last_access', b'_last_access', '_last_login', b'_last_login', 'date_added', b'date_added', 'emails', b'emails', 'last_access', b'last_access', 'last_login', b'last_login', 'user_id', b'user_id']) -> None:
422+
...
423+
424+
@typing.overload
425+
def WhichOneof(self, oneof_group: typing.Literal['_last_access', b'_last_access']) -> typing.Literal['last_access'] | None:
426+
...
427+
428+
@typing.overload
419429
def WhichOneof(self, oneof_group: typing.Literal['_last_login', b'_last_login']) -> typing.Literal['last_login'] | None:
420430
...
421431
global___OrganizationMember = OrganizationMember
@@ -2981,16 +2991,30 @@ class ListMachineSummariesRequest(google.protobuf.message.Message):
29812991
DESCRIPTOR: google.protobuf.descriptor.Descriptor
29822992
ORGANIZATION_ID_FIELD_NUMBER: builtins.int
29832993
FRAGMENT_IDS_FIELD_NUMBER: builtins.int
2994+
LOCATION_IDS_FIELD_NUMBER: builtins.int
2995+
LIMIT_FIELD_NUMBER: builtins.int
29842996
organization_id: builtins.str
2997+
limit: builtins.int
2998+
'Optional max number of machines to return; default to 100 if unset'
29852999

29863000
@property
29873001
def fragment_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
29883002
"""Optional list of fragment IDs to filter machines that use any of these fragments"""
29893003

2990-
def __init__(self, *, organization_id: builtins.str=..., fragment_ids: collections.abc.Iterable[builtins.str] | None=...) -> None:
3004+
@property
3005+
def location_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
3006+
"""Optional list of location IDs to filter machines that are in any of these locations."""
3007+
3008+
def __init__(self, *, organization_id: builtins.str=..., fragment_ids: collections.abc.Iterable[builtins.str] | None=..., location_ids: collections.abc.Iterable[builtins.str] | None=..., limit: builtins.int | None=...) -> None:
29913009
...
29923010

2993-
def ClearField(self, field_name: typing.Literal['fragment_ids', b'fragment_ids', 'organization_id', b'organization_id']) -> None:
3011+
def HasField(self, field_name: typing.Literal['_limit', b'_limit', 'limit', b'limit']) -> builtins.bool:
3012+
...
3013+
3014+
def ClearField(self, field_name: typing.Literal['_limit', b'_limit', 'fragment_ids', b'fragment_ids', 'limit', b'limit', 'location_ids', b'location_ids', 'organization_id', b'organization_id']) -> None:
3015+
...
3016+
3017+
def WhichOneof(self, oneof_group: typing.Literal['_limit', b'_limit']) -> typing.Literal['limit'] | None:
29943018
...
29953019
global___ListMachineSummariesRequest = ListMachineSummariesRequest
29963020

@@ -4252,17 +4276,36 @@ class App(google.protobuf.message.Message):
42524276
NAME_FIELD_NUMBER: builtins.int
42534277
TYPE_FIELD_NUMBER: builtins.int
42544278
ENTRYPOINT_FIELD_NUMBER: builtins.int
4279+
FRAGMENT_IDS_FIELD_NUMBER: builtins.int
4280+
LOGO_PATH_FIELD_NUMBER: builtins.int
4281+
CUSTOMIZATIONS_FIELD_NUMBER: builtins.int
42554282
name: builtins.str
42564283
'The name of the application'
42574284
type: builtins.str
42584285
'The type of the application'
42594286
entrypoint: builtins.str
42604287
'The entrypoint of the application'
4288+
logo_path: builtins.str
4289+
'Optional: path to a custom logo for branding'
4290+
4291+
@property
4292+
def fragment_ids(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
4293+
"""Optional: fragment IDs to filter machines in the picker"""
4294+
4295+
@property
4296+
def customizations(self) -> global___AppCustomizations:
4297+
"""Optional: structured customizations for the app (e.g., machine picker headings)"""
4298+
4299+
def __init__(self, *, name: builtins.str=..., type: builtins.str=..., entrypoint: builtins.str=..., fragment_ids: collections.abc.Iterable[builtins.str] | None=..., logo_path: builtins.str | None=..., customizations: global___AppCustomizations | None=...) -> None:
4300+
...
4301+
4302+
def HasField(self, field_name: typing.Literal['_logo_path', b'_logo_path', 'customizations', b'customizations', 'logo_path', b'logo_path']) -> builtins.bool:
4303+
...
42614304

4262-
def __init__(self, *, name: builtins.str=..., type: builtins.str=..., entrypoint: builtins.str=...) -> None:
4305+
def ClearField(self, field_name: typing.Literal['_logo_path', b'_logo_path', 'customizations', b'customizations', 'entrypoint', b'entrypoint', 'fragment_ids', b'fragment_ids', 'logo_path', b'logo_path', 'name', b'name', 'type', b'type']) -> None:
42634306
...
42644307

4265-
def ClearField(self, field_name: typing.Literal['entrypoint', b'entrypoint', 'name', b'name', 'type', b'type']) -> None:
4308+
def WhichOneof(self, oneof_group: typing.Literal['_logo_path', b'_logo_path']) -> typing.Literal['logo_path'] | None:
42664309
...
42674310
global___App = App
42684311

@@ -5345,4 +5388,139 @@ class OAuthConfig(google.protobuf.message.Message):
53455388

53465389
def ClearField(self, field_name: typing.Literal['client_authentication', b'client_authentication', 'enabled_grants', b'enabled_grants', 'logout_uri', b'logout_uri', 'origin_uris', b'origin_uris', 'pkce', b'pkce', 'redirect_uris', b'redirect_uris', 'url_validation', b'url_validation']) -> None:
53475390
...
5348-
global___OAuthConfig = OAuthConfig
5391+
global___OAuthConfig = OAuthConfig
5392+
5393+
@typing.final
5394+
class GetAppBrandingRequest(google.protobuf.message.Message):
5395+
"""Branding and customization for app machine picker"""
5396+
DESCRIPTOR: google.protobuf.descriptor.Descriptor
5397+
PUBLIC_NAMESPACE_FIELD_NUMBER: builtins.int
5398+
NAME_FIELD_NUMBER: builtins.int
5399+
public_namespace: builtins.str
5400+
name: builtins.str
5401+
5402+
def __init__(self, *, public_namespace: builtins.str=..., name: builtins.str=...) -> None:
5403+
...
5404+
5405+
def ClearField(self, field_name: typing.Literal['name', b'name', 'public_namespace', b'public_namespace']) -> None:
5406+
...
5407+
global___GetAppBrandingRequest = GetAppBrandingRequest
5408+
5409+
@typing.final
5410+
class TextOverrides(google.protobuf.message.Message):
5411+
DESCRIPTOR: google.protobuf.descriptor.Descriptor
5412+
5413+
@typing.final
5414+
class FieldsEntry(google.protobuf.message.Message):
5415+
DESCRIPTOR: google.protobuf.descriptor.Descriptor
5416+
KEY_FIELD_NUMBER: builtins.int
5417+
VALUE_FIELD_NUMBER: builtins.int
5418+
key: builtins.str
5419+
value: builtins.str
5420+
5421+
def __init__(self, *, key: builtins.str=..., value: builtins.str=...) -> None:
5422+
...
5423+
5424+
def ClearField(self, field_name: typing.Literal['key', b'key', 'value', b'value']) -> None:
5425+
...
5426+
FIELDS_FIELD_NUMBER: builtins.int
5427+
5428+
@property
5429+
def fields(self) -> google.protobuf.internal.containers.ScalarMap[builtins.str, builtins.str]:
5430+
...
5431+
5432+
def __init__(self, *, fields: collections.abc.Mapping[builtins.str, builtins.str] | None=...) -> None:
5433+
...
5434+
5435+
def ClearField(self, field_name: typing.Literal['fields', b'fields']) -> None:
5436+
...
5437+
global___TextOverrides = TextOverrides
5438+
5439+
@typing.final
5440+
class GetAppBrandingResponse(google.protobuf.message.Message):
5441+
DESCRIPTOR: google.protobuf.descriptor.Descriptor
5442+
5443+
@typing.final
5444+
class TextCustomizationsEntry(google.protobuf.message.Message):
5445+
DESCRIPTOR: google.protobuf.descriptor.Descriptor
5446+
KEY_FIELD_NUMBER: builtins.int
5447+
VALUE_FIELD_NUMBER: builtins.int
5448+
key: builtins.str
5449+
5450+
@property
5451+
def value(self) -> global___TextOverrides:
5452+
...
5453+
5454+
def __init__(self, *, key: builtins.str=..., value: global___TextOverrides | None=...) -> None:
5455+
...
5456+
5457+
def HasField(self, field_name: typing.Literal['value', b'value']) -> builtins.bool:
5458+
...
5459+
5460+
def ClearField(self, field_name: typing.Literal['key', b'key', 'value', b'value']) -> None:
5461+
...
5462+
LOGO_PATH_FIELD_NUMBER: builtins.int
5463+
TEXT_CUSTOMIZATIONS_FIELD_NUMBER: builtins.int
5464+
logo_path: builtins.str
5465+
5466+
@property
5467+
def text_customizations(self) -> google.protobuf.internal.containers.MessageMap[builtins.str, global___TextOverrides]:
5468+
...
5469+
5470+
def __init__(self, *, logo_path: builtins.str | None=..., text_customizations: collections.abc.Mapping[builtins.str, global___TextOverrides] | None=...) -> None:
5471+
...
5472+
5473+
def HasField(self, field_name: typing.Literal['_logo_path', b'_logo_path', 'logo_path', b'logo_path']) -> builtins.bool:
5474+
...
5475+
5476+
def ClearField(self, field_name: typing.Literal['_logo_path', b'_logo_path', 'logo_path', b'logo_path', 'text_customizations', b'text_customizations']) -> None:
5477+
...
5478+
5479+
def WhichOneof(self, oneof_group: typing.Literal['_logo_path', b'_logo_path']) -> typing.Literal['logo_path'] | None:
5480+
...
5481+
global___GetAppBrandingResponse = GetAppBrandingResponse
5482+
5483+
@typing.final
5484+
class AppCustomizations(google.protobuf.message.Message):
5485+
DESCRIPTOR: google.protobuf.descriptor.Descriptor
5486+
MACHINE_PICKER_FIELD_NUMBER: builtins.int
5487+
5488+
@property
5489+
def machine_picker(self) -> global___MachinePickerCustomizations:
5490+
...
5491+
5492+
def __init__(self, *, machine_picker: global___MachinePickerCustomizations | None=...) -> None:
5493+
...
5494+
5495+
def HasField(self, field_name: typing.Literal['machine_picker', b'machine_picker']) -> builtins.bool:
5496+
...
5497+
5498+
def ClearField(self, field_name: typing.Literal['machine_picker', b'machine_picker']) -> None:
5499+
...
5500+
global___AppCustomizations = AppCustomizations
5501+
5502+
@typing.final
5503+
class MachinePickerCustomizations(google.protobuf.message.Message):
5504+
DESCRIPTOR: google.protobuf.descriptor.Descriptor
5505+
HEADING_FIELD_NUMBER: builtins.int
5506+
SUBHEADING_FIELD_NUMBER: builtins.int
5507+
heading: builtins.str
5508+
subheading: builtins.str
5509+
5510+
def __init__(self, *, heading: builtins.str | None=..., subheading: builtins.str | None=...) -> None:
5511+
...
5512+
5513+
def HasField(self, field_name: typing.Literal['_heading', b'_heading', '_subheading', b'_subheading', 'heading', b'heading', 'subheading', b'subheading']) -> builtins.bool:
5514+
...
5515+
5516+
def ClearField(self, field_name: typing.Literal['_heading', b'_heading', '_subheading', b'_subheading', 'heading', b'heading', 'subheading', b'subheading']) -> None:
5517+
...
5518+
5519+
@typing.overload
5520+
def WhichOneof(self, oneof_group: typing.Literal['_heading', b'_heading']) -> typing.Literal['heading'] | None:
5521+
...
5522+
5523+
@typing.overload
5524+
def WhichOneof(self, oneof_group: typing.Literal['_subheading', b'_subheading']) -> typing.Literal['subheading'] | None:
5525+
...
5526+
global___MachinePickerCustomizations = MachinePickerCustomizations

0 commit comments

Comments
 (0)