From df5a429ff04c5c51b033e15c96c98c1039351ff3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 10:09:13 -0500 Subject: [PATCH] [WORKFLOW] Updating protos from viamrobotics/api, commit: 3212b337486d895d720c1ef8c7c8b5774879887f (#290) Co-authored-by: viambot --- lib/src/gen/app/v1/app.pb.dart | 70 +++++++++++++----------- lib/src/gen/app/v1/app.pbjson.dart | 27 ++++----- lib/src/gen/app/v1/robot.pb.dart | 14 +++++ lib/src/gen/app/v1/robot.pbjson.dart | 5 +- lib/src/gen/common/v1/common.pb.dart | 22 ++++++++ lib/src/gen/common/v1/common.pbjson.dart | 6 +- lib/src/utils.dart | 2 +- 7 files changed, 98 insertions(+), 48 deletions(-) diff --git a/lib/src/gen/app/v1/app.pb.dart b/lib/src/gen/app/v1/app.pb.dart index 72b3d5ad95d..d19f4d4ca63 100644 --- a/lib/src/gen/app/v1/app.pb.dart +++ b/lib/src/gen/app/v1/app.pb.dart @@ -6315,31 +6315,31 @@ class FragmentError extends $pb.GeneratedMessage { void clearDetail() => clearField(3); } -class FragmentTree extends $pb.GeneratedMessage { - factory FragmentTree({ - $core.String? rootFragmentId, - $core.Iterable<$core.String>? fragmentMergeOrder, +class ResolvedFragment extends $pb.GeneratedMessage { + factory ResolvedFragment({ + $core.String? fragmentId, + $43.Struct? resolvedConfig, FragmentError? error, }) { final $result = create(); - if (rootFragmentId != null) { - $result.rootFragmentId = rootFragmentId; + if (fragmentId != null) { + $result.fragmentId = fragmentId; } - if (fragmentMergeOrder != null) { - $result.fragmentMergeOrder.addAll(fragmentMergeOrder); + if (resolvedConfig != null) { + $result.resolvedConfig = resolvedConfig; } if (error != null) { $result.error = error; } return $result; } - FragmentTree._() : super(); - factory FragmentTree.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); - factory FragmentTree.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + ResolvedFragment._() : super(); + factory ResolvedFragment.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory ResolvedFragment.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); - static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'FragmentTree', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create) - ..aOS(1, _omitFieldNames ? '' : 'rootFragmentId') - ..pPS(2, _omitFieldNames ? '' : 'fragmentMergeOrder') + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ResolvedFragment', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create) + ..aOS(1, _omitFieldNames ? '' : 'fragmentId') + ..aOM<$43.Struct>(2, _omitFieldNames ? '' : 'resolvedConfig', subBuilder: $43.Struct.create) ..aOM(3, _omitFieldNames ? '' : 'error', subBuilder: FragmentError.create) ..hasRequiredFields = false ; @@ -6348,34 +6348,42 @@ class FragmentTree extends $pb.GeneratedMessage { 'Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' 'Will be removed in next major version') - FragmentTree clone() => FragmentTree()..mergeFromMessage(this); + ResolvedFragment clone() => ResolvedFragment()..mergeFromMessage(this); @$core.Deprecated( 'Using this can add significant overhead to your binary. ' 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' 'Will be removed in next major version') - FragmentTree copyWith(void Function(FragmentTree) updates) => super.copyWith((message) => updates(message as FragmentTree)) as FragmentTree; + ResolvedFragment copyWith(void Function(ResolvedFragment) updates) => super.copyWith((message) => updates(message as ResolvedFragment)) as ResolvedFragment; $pb.BuilderInfo get info_ => _i; @$core.pragma('dart2js:noInline') - static FragmentTree create() => FragmentTree._(); - FragmentTree createEmptyInstance() => create(); - static $pb.PbList createRepeated() => $pb.PbList(); + static ResolvedFragment create() => ResolvedFragment._(); + ResolvedFragment createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); @$core.pragma('dart2js:noInline') - static FragmentTree getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); - static FragmentTree? _defaultInstance; + static ResolvedFragment getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static ResolvedFragment? _defaultInstance; @$pb.TagNumber(1) - $core.String get rootFragmentId => $_getSZ(0); + $core.String get fragmentId => $_getSZ(0); @$pb.TagNumber(1) - set rootFragmentId($core.String v) { $_setString(0, v); } + set fragmentId($core.String v) { $_setString(0, v); } @$pb.TagNumber(1) - $core.bool hasRootFragmentId() => $_has(0); + $core.bool hasFragmentId() => $_has(0); @$pb.TagNumber(1) - void clearRootFragmentId() => clearField(1); + void clearFragmentId() => clearField(1); @$pb.TagNumber(2) - $core.List<$core.String> get fragmentMergeOrder => $_getList(1); + $43.Struct get resolvedConfig => $_getN(1); + @$pb.TagNumber(2) + set resolvedConfig($43.Struct v) { setField(2, v); } + @$pb.TagNumber(2) + $core.bool hasResolvedConfig() => $_has(1); + @$pb.TagNumber(2) + void clearResolvedConfig() => clearField(2); + @$pb.TagNumber(2) + $43.Struct ensureResolvedConfig() => $_ensure(1); @$pb.TagNumber(3) FragmentError get error => $_getN(2); @@ -7246,14 +7254,14 @@ class ListMachineFragmentsRequest extends $pb.GeneratedMessage { class ListMachineFragmentsResponse extends $pb.GeneratedMessage { factory ListMachineFragmentsResponse({ $core.Iterable? fragments, - $core.Iterable? fragmentTrees, + $core.Iterable? resolvedFragments, }) { final $result = create(); if (fragments != null) { $result.fragments.addAll(fragments); } - if (fragmentTrees != null) { - $result.fragmentTrees.addAll(fragmentTrees); + if (resolvedFragments != null) { + $result.resolvedFragments.addAll(resolvedFragments); } return $result; } @@ -7263,7 +7271,7 @@ class ListMachineFragmentsResponse extends $pb.GeneratedMessage { static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'ListMachineFragmentsResponse', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create) ..pc(1, _omitFieldNames ? '' : 'fragments', $pb.PbFieldType.PM, subBuilder: Fragment.create) - ..pc(2, _omitFieldNames ? '' : 'fragmentTrees', $pb.PbFieldType.PM, subBuilder: FragmentTree.create) + ..pc(2, _omitFieldNames ? '' : 'resolvedFragments', $pb.PbFieldType.PM, subBuilder: ResolvedFragment.create) ..hasRequiredFields = false ; @@ -7292,7 +7300,7 @@ class ListMachineFragmentsResponse extends $pb.GeneratedMessage { $core.List get fragments => $_getList(0); @$pb.TagNumber(2) - $core.List get fragmentTrees => $_getList(1); + $core.List get resolvedFragments => $_getList(1); } class ListRobotsResponse extends $pb.GeneratedMessage { diff --git a/lib/src/gen/app/v1/app.pbjson.dart b/lib/src/gen/app/v1/app.pbjson.dart index 99fd2644459..60ea09f4437 100644 --- a/lib/src/gen/app/v1/app.pbjson.dart +++ b/lib/src/gen/app/v1/app.pbjson.dart @@ -1571,21 +1571,22 @@ final $typed_data.Uint8List fragmentErrorDescriptor = $convert.base64Decode( 'VudEVycm9yVHlwZVIJZXJyb3JUeXBlEh8KC2ZyYWdtZW50X2lkGAIgASgJUgpmcmFnbWVudElk' 'EhYKBmRldGFpbBgDIAEoCVIGZGV0YWls'); -@$core.Deprecated('Use fragmentTreeDescriptor instead') -const FragmentTree$json = { - '1': 'FragmentTree', +@$core.Deprecated('Use resolvedFragmentDescriptor instead') +const ResolvedFragment$json = { + '1': 'ResolvedFragment', '2': [ - {'1': 'root_fragment_id', '3': 1, '4': 1, '5': 9, '10': 'rootFragmentId'}, - {'1': 'fragment_merge_order', '3': 2, '4': 3, '5': 9, '10': 'fragmentMergeOrder'}, + {'1': 'fragment_id', '3': 1, '4': 1, '5': 9, '10': 'fragmentId'}, + {'1': 'resolved_config', '3': 2, '4': 1, '5': 11, '6': '.google.protobuf.Struct', '10': 'resolvedConfig'}, {'1': 'error', '3': 3, '4': 1, '5': 11, '6': '.viam.app.v1.FragmentError', '10': 'error'}, ], }; -/// Descriptor for `FragmentTree`. Decode as a `google.protobuf.DescriptorProto`. -final $typed_data.Uint8List fragmentTreeDescriptor = $convert.base64Decode( - 'CgxGcmFnbWVudFRyZWUSKAoQcm9vdF9mcmFnbWVudF9pZBgBIAEoCVIOcm9vdEZyYWdtZW50SW' - 'QSMAoUZnJhZ21lbnRfbWVyZ2Vfb3JkZXIYAiADKAlSEmZyYWdtZW50TWVyZ2VPcmRlchIwCgVl' - 'cnJvchgDIAEoCzIaLnZpYW0uYXBwLnYxLkZyYWdtZW50RXJyb3JSBWVycm9y'); +/// Descriptor for `ResolvedFragment`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List resolvedFragmentDescriptor = $convert.base64Decode( + 'ChBSZXNvbHZlZEZyYWdtZW50Eh8KC2ZyYWdtZW50X2lkGAEgASgJUgpmcmFnbWVudElkEkAKD3' + 'Jlc29sdmVkX2NvbmZpZxgCIAEoCzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RSDnJlc29sdmVk' + 'Q29uZmlnEjAKBWVycm9yGAMgASgLMhoudmlhbS5hcHAudjEuRnJhZ21lbnRFcnJvclIFZXJyb3' + 'I='); @$core.Deprecated('Use listFragmentsRequestDescriptor instead') const ListFragmentsRequest$json = { @@ -1801,15 +1802,15 @@ const ListMachineFragmentsResponse$json = { '1': 'ListMachineFragmentsResponse', '2': [ {'1': 'fragments', '3': 1, '4': 3, '5': 11, '6': '.viam.app.v1.Fragment', '10': 'fragments'}, - {'1': 'fragment_trees', '3': 2, '4': 3, '5': 11, '6': '.viam.app.v1.FragmentTree', '10': 'fragmentTrees'}, + {'1': 'resolved_fragments', '3': 2, '4': 3, '5': 11, '6': '.viam.app.v1.ResolvedFragment', '10': 'resolvedFragments'}, ], }; /// Descriptor for `ListMachineFragmentsResponse`. Decode as a `google.protobuf.DescriptorProto`. final $typed_data.Uint8List listMachineFragmentsResponseDescriptor = $convert.base64Decode( 'ChxMaXN0TWFjaGluZUZyYWdtZW50c1Jlc3BvbnNlEjMKCWZyYWdtZW50cxgBIAMoCzIVLnZpYW' - '0uYXBwLnYxLkZyYWdtZW50UglmcmFnbWVudHMSQAoOZnJhZ21lbnRfdHJlZXMYAiADKAsyGS52' - 'aWFtLmFwcC52MS5GcmFnbWVudFRyZWVSDWZyYWdtZW50VHJlZXM='); + '0uYXBwLnYxLkZyYWdtZW50UglmcmFnbWVudHMSTAoScmVzb2x2ZWRfZnJhZ21lbnRzGAIgAygL' + 'Mh0udmlhbS5hcHAudjEuUmVzb2x2ZWRGcmFnbWVudFIRcmVzb2x2ZWRGcmFnbWVudHM='); @$core.Deprecated('Use listRobotsResponseDescriptor instead') const ListRobotsResponse$json = { diff --git a/lib/src/gen/app/v1/robot.pb.dart b/lib/src/gen/app/v1/robot.pb.dart index 8f8daf9793a..10a862ff694 100644 --- a/lib/src/gen/app/v1/robot.pb.dart +++ b/lib/src/gen/app/v1/robot.pb.dart @@ -883,6 +883,7 @@ class ProcessConfig extends $pb.GeneratedMessage { $core.int? stopSignal, $42.Duration? stopTimeout, $core.Map<$core.String, $core.String>? env, + $core.String? username, }) { final $result = create(); if (id != null) { @@ -912,6 +913,9 @@ class ProcessConfig extends $pb.GeneratedMessage { if (env != null) { $result.env.addAll(env); } + if (username != null) { + $result.username = username; + } return $result; } ProcessConfig._() : super(); @@ -928,6 +932,7 @@ class ProcessConfig extends $pb.GeneratedMessage { ..a<$core.int>(7, _omitFieldNames ? '' : 'stopSignal', $pb.PbFieldType.O3) ..aOM<$42.Duration>(8, _omitFieldNames ? '' : 'stopTimeout', subBuilder: $42.Duration.create) ..m<$core.String, $core.String>(9, _omitFieldNames ? '' : 'env', entryClassName: 'ProcessConfig.EnvEntry', keyFieldType: $pb.PbFieldType.OS, valueFieldType: $pb.PbFieldType.OS, packageName: const $pb.PackageName('viam.app.v1')) + ..aOS(10, _omitFieldNames ? '' : 'username') ..hasRequiredFields = false ; @@ -1023,6 +1028,15 @@ class ProcessConfig extends $pb.GeneratedMessage { /// additional environment variables passed to the process @$pb.TagNumber(9) $core.Map<$core.String, $core.String> get env => $_getMap(8); + + @$pb.TagNumber(10) + $core.String get username => $_getSZ(9); + @$pb.TagNumber(10) + set username($core.String v) { $_setString(9, v); } + @$pb.TagNumber(10) + $core.bool hasUsername() => $_has(9); + @$pb.TagNumber(10) + void clearUsername() => clearField(10); } class ServiceConfig extends $pb.GeneratedMessage { diff --git a/lib/src/gen/app/v1/robot.pbjson.dart b/lib/src/gen/app/v1/robot.pbjson.dart index 6c85d3e9b1e..c5360f5d278 100644 --- a/lib/src/gen/app/v1/robot.pbjson.dart +++ b/lib/src/gen/app/v1/robot.pbjson.dart @@ -216,6 +216,7 @@ const ProcessConfig$json = { {'1': 'stop_signal', '3': 7, '4': 1, '5': 5, '10': 'stopSignal'}, {'1': 'stop_timeout', '3': 8, '4': 1, '5': 11, '6': '.google.protobuf.Duration', '10': 'stopTimeout'}, {'1': 'env', '3': 9, '4': 3, '5': 11, '6': '.viam.app.v1.ProcessConfig.EnvEntry', '10': 'env'}, + {'1': 'username', '3': 10, '4': 1, '5': 9, '10': 'username'}, ], '3': [ProcessConfig_EnvEntry$json], }; @@ -237,8 +238,8 @@ final $typed_data.Uint8List processConfigDescriptor = $convert.base64Decode( 'ZVNob3QSEAoDbG9nGAYgASgIUgNsb2cSHwoLc3RvcF9zaWduYWwYByABKAVSCnN0b3BTaWduYW' 'wSPAoMc3RvcF90aW1lb3V0GAggASgLMhkuZ29vZ2xlLnByb3RvYnVmLkR1cmF0aW9uUgtzdG9w' 'VGltZW91dBI1CgNlbnYYCSADKAsyIy52aWFtLmFwcC52MS5Qcm9jZXNzQ29uZmlnLkVudkVudH' - 'J5UgNlbnYaNgoIRW52RW50cnkSEAoDa2V5GAEgASgJUgNrZXkSFAoFdmFsdWUYAiABKAlSBXZh' - 'bHVlOgI4AQ=='); + 'J5UgNlbnYSGgoIdXNlcm5hbWUYCiABKAlSCHVzZXJuYW1lGjYKCEVudkVudHJ5EhAKA2tleRgB' + 'IAEoCVIDa2V5EhQKBXZhbHVlGAIgASgJUgV2YWx1ZToCOAE='); @$core.Deprecated('Use serviceConfigDescriptor instead') const ServiceConfig$json = { diff --git a/lib/src/gen/common/v1/common.pb.dart b/lib/src/gen/common/v1/common.pb.dart index 558a7017e81..03c33195186 100644 --- a/lib/src/gen/common/v1/common.pb.dart +++ b/lib/src/gen/common/v1/common.pb.dart @@ -25,6 +25,8 @@ class ResourceName extends $pb.GeneratedMessage { $core.String? type, $core.String? subtype, $core.String? name, + $core.Iterable<$core.String>? remotePath, + $core.String? localName, }) { final $result = create(); if (namespace != null) { @@ -39,6 +41,12 @@ class ResourceName extends $pb.GeneratedMessage { if (name != null) { $result.name = name; } + if (remotePath != null) { + $result.remotePath.addAll(remotePath); + } + if (localName != null) { + $result.localName = localName; + } return $result; } ResourceName._() : super(); @@ -50,6 +58,8 @@ class ResourceName extends $pb.GeneratedMessage { ..aOS(2, _omitFieldNames ? '' : 'type') ..aOS(3, _omitFieldNames ? '' : 'subtype') ..aOS(4, _omitFieldNames ? '' : 'name') + ..pPS(5, _omitFieldNames ? '' : 'remotePath') + ..aOS(6, _omitFieldNames ? '' : 'localName') ..hasRequiredFields = false ; @@ -109,6 +119,18 @@ class ResourceName extends $pb.GeneratedMessage { $core.bool hasName() => $_has(3); @$pb.TagNumber(4) void clearName() => clearField(4); + + @$pb.TagNumber(5) + $core.List<$core.String> get remotePath => $_getList(4); + + @$pb.TagNumber(6) + $core.String get localName => $_getSZ(5); + @$pb.TagNumber(6) + set localName($core.String v) { $_setString(5, v); } + @$pb.TagNumber(6) + $core.bool hasLocalName() => $_has(5); + @$pb.TagNumber(6) + void clearLocalName() => clearField(6); } /// Pose is a combination of location and orientation. diff --git a/lib/src/gen/common/v1/common.pbjson.dart b/lib/src/gen/common/v1/common.pbjson.dart index e6e4cfb94b6..d682650a229 100644 --- a/lib/src/gen/common/v1/common.pbjson.dart +++ b/lib/src/gen/common/v1/common.pbjson.dart @@ -37,13 +37,17 @@ const ResourceName$json = { {'1': 'type', '3': 2, '4': 1, '5': 9, '10': 'type'}, {'1': 'subtype', '3': 3, '4': 1, '5': 9, '10': 'subtype'}, {'1': 'name', '3': 4, '4': 1, '5': 9, '10': 'name'}, + {'1': 'remote_path', '3': 5, '4': 3, '5': 9, '10': 'remotePath'}, + {'1': 'local_name', '3': 6, '4': 1, '5': 9, '10': 'localName'}, ], }; /// Descriptor for `ResourceName`. Decode as a `google.protobuf.DescriptorProto`. final $typed_data.Uint8List resourceNameDescriptor = $convert.base64Decode( 'CgxSZXNvdXJjZU5hbWUSHAoJbmFtZXNwYWNlGAEgASgJUgluYW1lc3BhY2USEgoEdHlwZRgCIA' - 'EoCVIEdHlwZRIYCgdzdWJ0eXBlGAMgASgJUgdzdWJ0eXBlEhIKBG5hbWUYBCABKAlSBG5hbWU='); + 'EoCVIEdHlwZRIYCgdzdWJ0eXBlGAMgASgJUgdzdWJ0eXBlEhIKBG5hbWUYBCABKAlSBG5hbWUS' + 'HwoLcmVtb3RlX3BhdGgYBSADKAlSCnJlbW90ZVBhdGgSHQoKbG9jYWxfbmFtZRgGIAEoCVIJbG' + '9jYWxOYW1l'); @$core.Deprecated('Use poseDescriptor instead') const Pose$json = { diff --git a/lib/src/utils.dart b/lib/src/utils.dart index db9643cb7f6..11a329bcf3d 100644 --- a/lib/src/utils.dart +++ b/lib/src/utils.dart @@ -94,7 +94,7 @@ grpc_duration.Duration durationToProto(Duration duration) { String getVersionMetadata() { const String sdkVersion = 'v0.0.25'; - const String apiTag = 'v0.1.354'; + const String apiTag = 'v0.1.357'; return 'flutter;$sdkVersion;$apiTag'; }