Skip to content

Commit 5290963

Browse files
Automated Protos Update (#451)
1 parent 961383b commit 5290963

File tree

8 files changed

+36
-31
lines changed

8 files changed

+36
-31
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
test:
1616
if: github.repository_owner == 'viamrobotics'
17-
runs-on: [self-hosted, x64]
17+
runs-on: buildjet-2vcpu-ubuntu-2204
1818
container:
1919
image: python:${{ matrix.python-version }}
2020
strategy:

src/viam/components/movement_sensor/movement_sensor.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from typing import Any, Dict, Final, Mapping, Optional, Tuple
44

55
from typing_extensions import Self
6+
67
from viam.components.component_base import ComponentBase
78
from viam.proto.component.movementsensor import GetPropertiesResponse
89
from viam.resource.types import RESOURCE_NAMESPACE_RDK, RESOURCE_TYPE_COMPONENT, Subtype

src/viam/gen/app/mltraining/v1/ml_training_pb2.py

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,16 @@
88
from google.protobuf import timestamp_pb2 as google_dot_protobuf_dot_timestamp__pb2
99
from google.rpc import status_pb2 as google_dot_rpc_dot_status__pb2
1010
from ....tagger.v1 import tagger_pb2 as tagger_dot_v1_dot_tagger__pb2
11-
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#app/mltraining/v1/ml_training.proto\x12\x16viam.app.mltraining.v1\x1a\x16app/data/v1/data.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/rpc/status.proto\x1a\x16tagger/v1/tagger.proto"\x87\x04\n\x18SubmitTrainingJobRequest\x12R\n\x06filter\x18\x01 \x01(\x0b2\x18.viam.app.data.v1.FilterB \x9a\x84\x9e\x03\x1bbson:"filter" json:"filter"R\x06filter\x12[\n\x0forganization_id\x18\x02 \x01(\tB2\x9a\x84\x9e\x03-bson:"organization_id" json:"organization_id"R\x0eorganizationId\x12G\n\nmodel_name\x18\x03 \x01(\tB(\x9a\x84\x9e\x03#bson:"model_name" json:"model_name"R\tmodelName\x12S\n\rmodel_version\x18\x04 \x01(\tB.\x9a\x84\x9e\x03)bson:"model_version" json:"model_version"R\x0cmodelVersion\x12j\n\nmodel_type\x18\x05 \x01(\x0e2!.viam.app.mltraining.v1.ModelTypeB(\x9a\x84\x9e\x03#bson:"model_type" json:"model_type"R\tmodelType\x120\n\x04tags\x18\x06 \x03(\tB\x1c\x9a\x84\x9e\x03\x17bson:"tags" json:"tags"R\x04tags"+\n\x19SubmitTrainingJobResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id"\'\n\x15GetTrainingJobRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id"a\n\x16GetTrainingJobResponse\x12G\n\x08metadata\x18\x01 \x01(\x0b2+.viam.app.mltraining.v1.TrainingJobMetadataR\x08metadata"\x82\x01\n\x17ListTrainingJobsRequest\x12\'\n\x0forganization_id\x18\x01 \x01(\tR\x0eorganizationId\x12>\n\x06status\x18\x02 \x01(\x0e2&.viam.app.mltraining.v1.TrainingStatusR\x06status"[\n\x18ListTrainingJobsResponse\x12?\n\x04jobs\x18\x01 \x03(\x0b2+.viam.app.mltraining.v1.TrainingJobMetadataR\x04jobs"\xc5\x05\n\x13TrainingJobMetadata\x12n\n\x07request\x18\x01 \x01(\x0b20.viam.app.mltraining.v1.SubmitTrainingJobRequestB"\x9a\x84\x9e\x03\x1dbson:"request" json:"request"R\x07request\x12`\n\x06status\x18\x02 \x01(\x0e2&.viam.app.mltraining.v1.TrainingStatusB \x9a\x84\x9e\x03\x1bbson:"status" json:"status"R\x06status\x12c\n\ncreated_on\x18\x03 \x01(\x0b2\x1a.google.protobuf.TimestampB(\x9a\x84\x9e\x03#bson:"created_on" json:"created_on"R\tcreatedOn\x12o\n\rlast_modified\x18\x04 \x01(\x0b2\x1a.google.protobuf.TimestampB.\x9a\x84\x9e\x03)bson:"last_modified" json:"last_modified"R\x0clastModified\x12Z\n\x0fsynced_model_id\x18\x05 \x01(\tB2\x9a\x84\x9e\x03-bson:"synced_model_id" json:"synced_model_id"R\rsyncedModelId\x123\n\x02id\x18\x07 \x01(\tB#\x9a\x84\x9e\x03\x1ebson:"_id" json:"id,omitempty"R\x02id\x12c\n\x0cerror_status\x18\x08 \x01(\x0b2\x12.google.rpc.StatusB,\x9a\x84\x9e\x03\'bson:"error_status" json:"error_status"R\x0berrorStatusJ\x04\x08\x06\x10\x07R\nuser_email"*\n\x18CancelTrainingJobRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id"\x1b\n\x19CancelTrainingJobResponse*\x9f\x01\n\tModelType\x12\x1a\n\x16MODEL_TYPE_UNSPECIFIED\x10\x00\x12*\n&MODEL_TYPE_SINGLE_LABEL_CLASSIFICATION\x10\x01\x12)\n%MODEL_TYPE_MULTI_LABEL_CLASSIFICATION\x10\x02\x12\x1f\n\x1bMODEL_TYPE_OBJECT_DETECTION\x10\x03*\xe7\x01\n\x0eTrainingStatus\x12\x1f\n\x1bTRAINING_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n\x17TRAINING_STATUS_PENDING\x10\x01\x12\x1f\n\x1bTRAINING_STATUS_IN_PROGRESS\x10\x02\x12\x1d\n\x19TRAINING_STATUS_COMPLETED\x10\x03\x12\x1a\n\x16TRAINING_STATUS_FAILED\x10\x04\x12\x1c\n\x18TRAINING_STATUS_CANCELED\x10\x05\x12\x1d\n\x19TRAINING_STATUS_CANCELING\x10\x062\xef\x03\n\x11MLTrainingService\x12x\n\x11SubmitTrainingJob\x120.viam.app.mltraining.v1.SubmitTrainingJobRequest\x1a1.viam.app.mltraining.v1.SubmitTrainingJobResponse\x12o\n\x0eGetTrainingJob\x12-.viam.app.mltraining.v1.GetTrainingJobRequest\x1a..viam.app.mltraining.v1.GetTrainingJobResponse\x12u\n\x10ListTrainingJobs\x12/.viam.app.mltraining.v1.ListTrainingJobsRequest\x1a0.viam.app.mltraining.v1.ListTrainingJobsResponse\x12x\n\x11CancelTrainingJob\x120.viam.app.mltraining.v1.CancelTrainingJobRequest\x1a1.viam.app.mltraining.v1.CancelTrainingJobResponseB#Z!go.viam.com/api/app/mltraining/v1b\x06proto3')
11+
DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n#app/mltraining/v1/ml_training.proto\x12\x16viam.app.mltraining.v1\x1a\x16app/data/v1/data.proto\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x17google/rpc/status.proto\x1a\x16tagger/v1/tagger.proto"\xd0\x04\n\x18SubmitTrainingJobRequest\x12R\n\x06filter\x18\x01 \x01(\x0b2\x18.viam.app.data.v1.FilterB \x9a\x84\x9e\x03\x1bbson:"filter" json:"filter"R\x06filter\x12G\n\ndataset_id\x18\x07 \x01(\tB(\x9a\x84\x9e\x03#bson:"dataset_id" json:"dataset_id"R\tdatasetId\x12[\n\x0forganization_id\x18\x02 \x01(\tB2\x9a\x84\x9e\x03-bson:"organization_id" json:"organization_id"R\x0eorganizationId\x12G\n\nmodel_name\x18\x03 \x01(\tB(\x9a\x84\x9e\x03#bson:"model_name" json:"model_name"R\tmodelName\x12S\n\rmodel_version\x18\x04 \x01(\tB.\x9a\x84\x9e\x03)bson:"model_version" json:"model_version"R\x0cmodelVersion\x12j\n\nmodel_type\x18\x05 \x01(\x0e2!.viam.app.mltraining.v1.ModelTypeB(\x9a\x84\x9e\x03#bson:"model_type" json:"model_type"R\tmodelType\x120\n\x04tags\x18\x06 \x03(\tB\x1c\x9a\x84\x9e\x03\x17bson:"tags" json:"tags"R\x04tags"+\n\x19SubmitTrainingJobResponse\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id"\'\n\x15GetTrainingJobRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id"a\n\x16GetTrainingJobResponse\x12G\n\x08metadata\x18\x01 \x01(\x0b2+.viam.app.mltraining.v1.TrainingJobMetadataR\x08metadata"\x82\x01\n\x17ListTrainingJobsRequest\x12\'\n\x0forganization_id\x18\x01 \x01(\tR\x0eorganizationId\x12>\n\x06status\x18\x02 \x01(\x0e2&.viam.app.mltraining.v1.TrainingStatusR\x06status"[\n\x18ListTrainingJobsResponse\x12?\n\x04jobs\x18\x01 \x03(\x0b2+.viam.app.mltraining.v1.TrainingJobMetadataR\x04jobs"\xc5\x05\n\x13TrainingJobMetadata\x12n\n\x07request\x18\x01 \x01(\x0b20.viam.app.mltraining.v1.SubmitTrainingJobRequestB"\x9a\x84\x9e\x03\x1dbson:"request" json:"request"R\x07request\x12`\n\x06status\x18\x02 \x01(\x0e2&.viam.app.mltraining.v1.TrainingStatusB \x9a\x84\x9e\x03\x1bbson:"status" json:"status"R\x06status\x12c\n\ncreated_on\x18\x03 \x01(\x0b2\x1a.google.protobuf.TimestampB(\x9a\x84\x9e\x03#bson:"created_on" json:"created_on"R\tcreatedOn\x12o\n\rlast_modified\x18\x04 \x01(\x0b2\x1a.google.protobuf.TimestampB.\x9a\x84\x9e\x03)bson:"last_modified" json:"last_modified"R\x0clastModified\x12Z\n\x0fsynced_model_id\x18\x05 \x01(\tB2\x9a\x84\x9e\x03-bson:"synced_model_id" json:"synced_model_id"R\rsyncedModelId\x123\n\x02id\x18\x07 \x01(\tB#\x9a\x84\x9e\x03\x1ebson:"_id" json:"id,omitempty"R\x02id\x12c\n\x0cerror_status\x18\x08 \x01(\x0b2\x12.google.rpc.StatusB,\x9a\x84\x9e\x03\'bson:"error_status" json:"error_status"R\x0berrorStatusJ\x04\x08\x06\x10\x07R\nuser_email"*\n\x18CancelTrainingJobRequest\x12\x0e\n\x02id\x18\x01 \x01(\tR\x02id"\x1b\n\x19CancelTrainingJobResponse*\x9f\x01\n\tModelType\x12\x1a\n\x16MODEL_TYPE_UNSPECIFIED\x10\x00\x12*\n&MODEL_TYPE_SINGLE_LABEL_CLASSIFICATION\x10\x01\x12)\n%MODEL_TYPE_MULTI_LABEL_CLASSIFICATION\x10\x02\x12\x1f\n\x1bMODEL_TYPE_OBJECT_DETECTION\x10\x03*\xe7\x01\n\x0eTrainingStatus\x12\x1f\n\x1bTRAINING_STATUS_UNSPECIFIED\x10\x00\x12\x1b\n\x17TRAINING_STATUS_PENDING\x10\x01\x12\x1f\n\x1bTRAINING_STATUS_IN_PROGRESS\x10\x02\x12\x1d\n\x19TRAINING_STATUS_COMPLETED\x10\x03\x12\x1a\n\x16TRAINING_STATUS_FAILED\x10\x04\x12\x1c\n\x18TRAINING_STATUS_CANCELED\x10\x05\x12\x1d\n\x19TRAINING_STATUS_CANCELING\x10\x062\xef\x03\n\x11MLTrainingService\x12x\n\x11SubmitTrainingJob\x120.viam.app.mltraining.v1.SubmitTrainingJobRequest\x1a1.viam.app.mltraining.v1.SubmitTrainingJobResponse\x12o\n\x0eGetTrainingJob\x12-.viam.app.mltraining.v1.GetTrainingJobRequest\x1a..viam.app.mltraining.v1.GetTrainingJobResponse\x12u\n\x10ListTrainingJobs\x12/.viam.app.mltraining.v1.ListTrainingJobsRequest\x1a0.viam.app.mltraining.v1.ListTrainingJobsResponse\x12x\n\x11CancelTrainingJob\x120.viam.app.mltraining.v1.CancelTrainingJobRequest\x1a1.viam.app.mltraining.v1.CancelTrainingJobResponseB#Z!go.viam.com/api/app/mltraining/v1b\x06proto3')
1212
_builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, globals())
1313
_builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'app.mltraining.v1.ml_training_pb2', globals())
1414
if _descriptor._USE_C_DESCRIPTORS == False:
1515
DESCRIPTOR._options = None
1616
DESCRIPTOR._serialized_options = b'Z!go.viam.com/api/app/mltraining/v1'
1717
_SUBMITTRAININGJOBREQUEST.fields_by_name['filter']._options = None
1818
_SUBMITTRAININGJOBREQUEST.fields_by_name['filter']._serialized_options = b'\x9a\x84\x9e\x03\x1bbson:"filter" json:"filter"'
19+
_SUBMITTRAININGJOBREQUEST.fields_by_name['dataset_id']._options = None
20+
_SUBMITTRAININGJOBREQUEST.fields_by_name['dataset_id']._serialized_options = b'\x9a\x84\x9e\x03#bson:"dataset_id" json:"dataset_id"'
1921
_SUBMITTRAININGJOBREQUEST.fields_by_name['organization_id']._options = None
2022
_SUBMITTRAININGJOBREQUEST.fields_by_name['organization_id']._serialized_options = b'\x9a\x84\x9e\x03-bson:"organization_id" json:"organization_id"'
2123
_SUBMITTRAININGJOBREQUEST.fields_by_name['model_name']._options = None
@@ -40,27 +42,27 @@
4042
_TRAININGJOBMETADATA.fields_by_name['id']._serialized_options = b'\x9a\x84\x9e\x03\x1ebson:"_id" json:"id,omitempty"'
4143
_TRAININGJOBMETADATA.fields_by_name['error_status']._options = None
4244
_TRAININGJOBMETADATA.fields_by_name['error_status']._serialized_options = b'\x9a\x84\x9e\x03\'bson:"error_status" json:"error_status"'
43-
_MODELTYPE._serialized_start = 1888
44-
_MODELTYPE._serialized_end = 2047
45-
_TRAININGSTATUS._serialized_start = 2050
46-
_TRAININGSTATUS._serialized_end = 2281
45+
_MODELTYPE._serialized_start = 1961
46+
_MODELTYPE._serialized_end = 2120
47+
_TRAININGSTATUS._serialized_start = 2123
48+
_TRAININGSTATUS._serialized_end = 2354
4749
_SUBMITTRAININGJOBREQUEST._serialized_start = 170
48-
_SUBMITTRAININGJOBREQUEST._serialized_end = 689
49-
_SUBMITTRAININGJOBRESPONSE._serialized_start = 691
50-
_SUBMITTRAININGJOBRESPONSE._serialized_end = 734
51-
_GETTRAININGJOBREQUEST._serialized_start = 736
52-
_GETTRAININGJOBREQUEST._serialized_end = 775
53-
_GETTRAININGJOBRESPONSE._serialized_start = 777
54-
_GETTRAININGJOBRESPONSE._serialized_end = 874
55-
_LISTTRAININGJOBSREQUEST._serialized_start = 877
56-
_LISTTRAININGJOBSREQUEST._serialized_end = 1007
57-
_LISTTRAININGJOBSRESPONSE._serialized_start = 1009
58-
_LISTTRAININGJOBSRESPONSE._serialized_end = 1100
59-
_TRAININGJOBMETADATA._serialized_start = 1103
60-
_TRAININGJOBMETADATA._serialized_end = 1812
61-
_CANCELTRAININGJOBREQUEST._serialized_start = 1814
62-
_CANCELTRAININGJOBREQUEST._serialized_end = 1856
63-
_CANCELTRAININGJOBRESPONSE._serialized_start = 1858
64-
_CANCELTRAININGJOBRESPONSE._serialized_end = 1885
65-
_MLTRAININGSERVICE._serialized_start = 2284
66-
_MLTRAININGSERVICE._serialized_end = 2779
50+
_SUBMITTRAININGJOBREQUEST._serialized_end = 762
51+
_SUBMITTRAININGJOBRESPONSE._serialized_start = 764
52+
_SUBMITTRAININGJOBRESPONSE._serialized_end = 807
53+
_GETTRAININGJOBREQUEST._serialized_start = 809
54+
_GETTRAININGJOBREQUEST._serialized_end = 848
55+
_GETTRAININGJOBRESPONSE._serialized_start = 850
56+
_GETTRAININGJOBRESPONSE._serialized_end = 947
57+
_LISTTRAININGJOBSREQUEST._serialized_start = 950
58+
_LISTTRAININGJOBSREQUEST._serialized_end = 1080
59+
_LISTTRAININGJOBSRESPONSE._serialized_start = 1082
60+
_LISTTRAININGJOBSRESPONSE._serialized_end = 1173
61+
_TRAININGJOBMETADATA._serialized_start = 1176
62+
_TRAININGJOBMETADATA._serialized_end = 1885
63+
_CANCELTRAININGJOBREQUEST._serialized_start = 1887
64+
_CANCELTRAININGJOBREQUEST._serialized_end = 1929
65+
_CANCELTRAININGJOBRESPONSE._serialized_start = 1931
66+
_CANCELTRAININGJOBRESPONSE._serialized_end = 1958
67+
_MLTRAININGSERVICE._serialized_start = 2357
68+
_MLTRAININGSERVICE._serialized_end = 2852

src/viam/gen/app/mltraining/v1/ml_training_pb2.pyi

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ global___TrainingStatus = TrainingStatus
6767
class SubmitTrainingJobRequest(google.protobuf.message.Message):
6868
DESCRIPTOR: google.protobuf.descriptor.Descriptor
6969
FILTER_FIELD_NUMBER: builtins.int
70+
DATASET_ID_FIELD_NUMBER: builtins.int
7071
ORGANIZATION_ID_FIELD_NUMBER: builtins.int
7172
MODEL_NAME_FIELD_NUMBER: builtins.int
7273
MODEL_VERSION_FIELD_NUMBER: builtins.int
@@ -76,6 +77,7 @@ class SubmitTrainingJobRequest(google.protobuf.message.Message):
7677
@property
7778
def filter(self) -> app.data.v1.data_pb2.Filter:
7879
...
80+
dataset_id: builtins.str
7981
organization_id: builtins.str
8082
model_name: builtins.str
8183
model_version: builtins.str
@@ -85,13 +87,13 @@ class SubmitTrainingJobRequest(google.protobuf.message.Message):
8587
def tags(self) -> google.protobuf.internal.containers.RepeatedScalarFieldContainer[builtins.str]:
8688
...
8789

88-
def __init__(self, *, filter: app.data.v1.data_pb2.Filter | None=..., organization_id: builtins.str=..., model_name: builtins.str=..., model_version: builtins.str=..., model_type: global___ModelType.ValueType=..., tags: collections.abc.Iterable[builtins.str] | None=...) -> None:
90+
def __init__(self, *, filter: app.data.v1.data_pb2.Filter | None=..., dataset_id: builtins.str=..., organization_id: builtins.str=..., model_name: builtins.str=..., model_version: builtins.str=..., model_type: global___ModelType.ValueType=..., tags: collections.abc.Iterable[builtins.str] | None=...) -> None:
8991
...
9092

9193
def HasField(self, field_name: typing_extensions.Literal['filter', b'filter']) -> builtins.bool:
9294
...
9395

94-
def ClearField(self, field_name: typing_extensions.Literal['filter', b'filter', 'model_name', b'model_name', 'model_type', b'model_type', 'model_version', b'model_version', 'organization_id', b'organization_id', 'tags', b'tags']) -> None:
96+
def ClearField(self, field_name: typing_extensions.Literal['dataset_id', b'dataset_id', 'filter', b'filter', 'model_name', b'model_name', 'model_type', b'model_type', 'model_version', b'model_version', 'organization_id', b'organization_id', 'tags', b'tags']) -> None:
9597
...
9698
global___SubmitTrainingJobRequest = SubmitTrainingJobRequest
9799

src/viam/rpc/dial.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
import warnings
99
from dataclasses import dataclass
1010
from typing import Callable, Literal, Optional, Tuple, Type, Union
11-
from typing_extensions import Self
1211

1312
from grpclib.client import Channel, Stream
1413
from grpclib.const import Cardinality
1514
from grpclib.metadata import Deadline, _MetadataLike
1615
from grpclib.protocol import H2Protocol
1716
from grpclib.stream import _RecvType, _SendType
17+
from typing_extensions import Self
1818

1919
from viam import logging
2020
from viam.errors import InsecureConnectionError, ViamError

src/viam/services/navigation/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from viam.proto.common import GeoObstacle, GeoPoint
2-
from viam.proto.service.navigation import Mode, Waypoint, Path
2+
from viam.proto.service.navigation import Mode, Path, Waypoint
33
from viam.resource.registry import Registry, ResourceRegistration
44

55
from .client import NavigationClient

src/viam/services/navigation/client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
GetWaypointsRequest,
1717
GetWaypointsResponse,
1818
NavigationServiceStub,
19+
Path,
1920
RemoveWaypointRequest,
2021
SetModeRequest,
21-
Path,
2222
)
2323
from viam.resource.rpc_client_base import ReconfigurableResourceRPCClientBase
2424
from viam.utils import ValueTypes, dict_to_struct, struct_to_dict

src/viam/services/navigation/navigation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from viam.resource.types import RESOURCE_NAMESPACE_RDK, RESOURCE_TYPE_SERVICE, Subtype
55

66
from ..service_base import ServiceBase
7-
from . import GeoObstacle, GeoPoint, Mode, Waypoint, Path
7+
from . import GeoObstacle, GeoPoint, Mode, Path, Waypoint
88

99

1010
class Navigation(ServiceBase):

0 commit comments

Comments
 (0)