diff --git a/lib/src/gen/app/data/v1/data.pb.dart b/lib/src/gen/app/data/v1/data.pb.dart index 807cff5908..bdec54ef16 100644 --- a/lib/src/gen/app/data/v1/data.pb.dart +++ b/lib/src/gen/app/data/v1/data.pb.dart @@ -1628,6 +1628,7 @@ class BoundingBox extends $pb.GeneratedMessage { $core.double? yMinNormalized, $core.double? xMaxNormalized, $core.double? yMaxNormalized, + $core.double? confidence, }) { final $result = create(); if (id != null) { @@ -1648,6 +1649,9 @@ class BoundingBox extends $pb.GeneratedMessage { if (yMaxNormalized != null) { $result.yMaxNormalized = yMaxNormalized; } + if (confidence != null) { + $result.confidence = confidence; + } return $result; } BoundingBox._() : super(); @@ -1661,6 +1665,7 @@ class BoundingBox extends $pb.GeneratedMessage { ..a<$core.double>(4, _omitFieldNames ? '' : 'yMinNormalized', $pb.PbFieldType.OD) ..a<$core.double>(5, _omitFieldNames ? '' : 'xMaxNormalized', $pb.PbFieldType.OD) ..a<$core.double>(6, _omitFieldNames ? '' : 'yMaxNormalized', $pb.PbFieldType.OD) + ..a<$core.double>(7, _omitFieldNames ? '' : 'confidence', $pb.PbFieldType.OD) ..hasRequiredFields = false ; @@ -1738,17 +1743,97 @@ class BoundingBox extends $pb.GeneratedMessage { $core.bool hasYMaxNormalized() => $_has(5); @$pb.TagNumber(6) void clearYMaxNormalized() => clearField(6); + + /// confidence is an optional range from 0 - 1 + @$pb.TagNumber(7) + $core.double get confidence => $_getN(6); + @$pb.TagNumber(7) + set confidence($core.double v) { $_setDouble(6, v); } + @$pb.TagNumber(7) + $core.bool hasConfidence() => $_has(6); + @$pb.TagNumber(7) + void clearConfidence() => clearField(7); +} + +/// Classification represents a confidence score with a label. +class Classification extends $pb.GeneratedMessage { + factory Classification({ + $core.String? label, + $core.double? confidence, + }) { + final $result = create(); + if (label != null) { + $result.label = label; + } + if (confidence != null) { + $result.confidence = confidence; + } + return $result; + } + Classification._() : super(); + factory Classification.fromBuffer($core.List<$core.int> i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(i, r); + factory Classification.fromJson($core.String i, [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(i, r); + + static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Classification', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.data.v1'), createEmptyInstance: create) + ..aOS(1, _omitFieldNames ? '' : 'label') + ..a<$core.double>(2, _omitFieldNames ? '' : 'confidence', $pb.PbFieldType.OD) + ..hasRequiredFields = false + ; + + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.deepCopy] instead. ' + 'Will be removed in next major version') + Classification clone() => Classification()..mergeFromMessage(this); + @$core.Deprecated( + 'Using this can add significant overhead to your binary. ' + 'Use [GeneratedMessageGenericExtensions.rebuild] instead. ' + 'Will be removed in next major version') + Classification copyWith(void Function(Classification) updates) => super.copyWith((message) => updates(message as Classification)) as Classification; + + $pb.BuilderInfo get info_ => _i; + + @$core.pragma('dart2js:noInline') + static Classification create() => Classification._(); + Classification createEmptyInstance() => create(); + static $pb.PbList createRepeated() => $pb.PbList(); + @$core.pragma('dart2js:noInline') + static Classification getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor(create); + static Classification? _defaultInstance; + + @$pb.TagNumber(1) + $core.String get label => $_getSZ(0); + @$pb.TagNumber(1) + set label($core.String v) { $_setString(0, v); } + @$pb.TagNumber(1) + $core.bool hasLabel() => $_has(0); + @$pb.TagNumber(1) + void clearLabel() => clearField(1); + + /// confidence is an optional range from 0 - 1 + @$pb.TagNumber(2) + $core.double get confidence => $_getN(1); + @$pb.TagNumber(2) + set confidence($core.double v) { $_setDouble(1, v); } + @$pb.TagNumber(2) + $core.bool hasConfidence() => $_has(1); + @$pb.TagNumber(2) + void clearConfidence() => clearField(2); } /// Annotations are data annotations used for machine learning. class Annotations extends $pb.GeneratedMessage { factory Annotations({ $core.Iterable? bboxes, + $core.Iterable? classifications, }) { final $result = create(); if (bboxes != null) { $result.bboxes.addAll(bboxes); } + if (classifications != null) { + $result.classifications.addAll(classifications); + } return $result; } Annotations._() : super(); @@ -1757,6 +1842,7 @@ class Annotations extends $pb.GeneratedMessage { static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'Annotations', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.data.v1'), createEmptyInstance: create) ..pc(1, _omitFieldNames ? '' : 'bboxes', $pb.PbFieldType.PM, subBuilder: BoundingBox.create) + ..pc(2, _omitFieldNames ? '' : 'classifications', $pb.PbFieldType.PM, subBuilder: Classification.create) ..hasRequiredFields = false ; @@ -1783,6 +1869,9 @@ class Annotations extends $pb.GeneratedMessage { @$pb.TagNumber(1) $core.List get bboxes => $_getList(0); + + @$pb.TagNumber(2) + $core.List get classifications => $_getList(1); } /// BinaryMetadata is the metadata associated with binary data. diff --git a/lib/src/gen/app/data/v1/data.pbjson.dart b/lib/src/gen/app/data/v1/data.pbjson.dart index e90186e5d4..4f8246c627 100644 --- a/lib/src/gen/app/data/v1/data.pbjson.dart +++ b/lib/src/gen/app/data/v1/data.pbjson.dart @@ -402,6 +402,10 @@ const BoundingBox$json = { {'1': 'y_min_normalized', '3': 4, '4': 1, '5': 1, '10': 'yMinNormalized'}, {'1': 'x_max_normalized', '3': 5, '4': 1, '5': 1, '10': 'xMaxNormalized'}, {'1': 'y_max_normalized', '3': 6, '4': 1, '5': 1, '10': 'yMaxNormalized'}, + {'1': 'confidence', '3': 7, '4': 1, '5': 1, '9': 0, '10': 'confidence', '17': true}, + ], + '8': [ + {'1': '_confidence'}, ], }; @@ -410,20 +414,40 @@ final $typed_data.Uint8List boundingBoxDescriptor = $convert.base64Decode( 'CgtCb3VuZGluZ0JveBIOCgJpZBgBIAEoCVICaWQSFAoFbGFiZWwYAiABKAlSBWxhYmVsEigKEH' 'hfbWluX25vcm1hbGl6ZWQYAyABKAFSDnhNaW5Ob3JtYWxpemVkEigKEHlfbWluX25vcm1hbGl6' 'ZWQYBCABKAFSDnlNaW5Ob3JtYWxpemVkEigKEHhfbWF4X25vcm1hbGl6ZWQYBSABKAFSDnhNYX' - 'hOb3JtYWxpemVkEigKEHlfbWF4X25vcm1hbGl6ZWQYBiABKAFSDnlNYXhOb3JtYWxpemVk'); + 'hOb3JtYWxpemVkEigKEHlfbWF4X25vcm1hbGl6ZWQYBiABKAFSDnlNYXhOb3JtYWxpemVkEiMK' + 'CmNvbmZpZGVuY2UYByABKAFIAFIKY29uZmlkZW5jZYgBAUINCgtfY29uZmlkZW5jZQ=='); + +@$core.Deprecated('Use classificationDescriptor instead') +const Classification$json = { + '1': 'Classification', + '2': [ + {'1': 'label', '3': 1, '4': 1, '5': 9, '10': 'label'}, + {'1': 'confidence', '3': 2, '4': 1, '5': 1, '9': 0, '10': 'confidence', '17': true}, + ], + '8': [ + {'1': '_confidence'}, + ], +}; + +/// Descriptor for `Classification`. Decode as a `google.protobuf.DescriptorProto`. +final $typed_data.Uint8List classificationDescriptor = $convert.base64Decode( + 'Cg5DbGFzc2lmaWNhdGlvbhIUCgVsYWJlbBgBIAEoCVIFbGFiZWwSIwoKY29uZmlkZW5jZRgCIA' + 'EoAUgAUgpjb25maWRlbmNliAEBQg0KC19jb25maWRlbmNl'); @$core.Deprecated('Use annotationsDescriptor instead') const Annotations$json = { '1': 'Annotations', '2': [ {'1': 'bboxes', '3': 1, '4': 3, '5': 11, '6': '.viam.app.data.v1.BoundingBox', '10': 'bboxes'}, + {'1': 'classifications', '3': 2, '4': 3, '5': 11, '6': '.viam.app.data.v1.Classification', '10': 'classifications'}, ], }; /// Descriptor for `Annotations`. Decode as a `google.protobuf.DescriptorProto`. final $typed_data.Uint8List annotationsDescriptor = $convert.base64Decode( 'CgtBbm5vdGF0aW9ucxI1CgZiYm94ZXMYASADKAsyHS52aWFtLmFwcC5kYXRhLnYxLkJvdW5kaW' - '5nQm94UgZiYm94ZXM='); + '5nQm94UgZiYm94ZXMSSgoPY2xhc3NpZmljYXRpb25zGAIgAygLMiAudmlhbS5hcHAuZGF0YS52' + 'MS5DbGFzc2lmaWNhdGlvblIPY2xhc3NpZmljYXRpb25z'); @$core.Deprecated('Use binaryMetadataDescriptor instead') const BinaryMetadata$json = { diff --git a/lib/src/gen/app/datasync/v1/data_sync.pb.dart b/lib/src/gen/app/datasync/v1/data_sync.pb.dart index 1d7d08fd3c..0e8aa76eb1 100644 --- a/lib/src/gen/app/datasync/v1/data_sync.pb.dart +++ b/lib/src/gen/app/datasync/v1/data_sync.pb.dart @@ -16,6 +16,7 @@ import 'package:protobuf/protobuf.dart' as $pb; import '../../../google/protobuf/any.pb.dart' as $45; import '../../../google/protobuf/struct.pb.dart' as $43; import '../../../google/protobuf/timestamp.pb.dart' as $44; +import '../../data/v1/data.pb.dart' as $3; import 'data_sync.pbenum.dart'; export 'data_sync.pbenum.dart'; @@ -402,11 +403,14 @@ class StreamingDataCaptureUploadResponse extends $pb.GeneratedMessage { void clearFileId() => clearField(1); } -/// SensorMetadata contains the time the sensor data was requested and was received. +/// SensorMetadata contains the time the sensor data was requested and was +/// received. class SensorMetadata extends $pb.GeneratedMessage { factory SensorMetadata({ $44.Timestamp? timeRequested, $44.Timestamp? timeReceived, + MimeType? mimeType, + $3.Annotations? annotations, }) { final $result = create(); if (timeRequested != null) { @@ -415,6 +419,12 @@ class SensorMetadata extends $pb.GeneratedMessage { if (timeReceived != null) { $result.timeReceived = timeReceived; } + if (mimeType != null) { + $result.mimeType = mimeType; + } + if (annotations != null) { + $result.annotations = annotations; + } return $result; } SensorMetadata._() : super(); @@ -424,6 +434,8 @@ class SensorMetadata extends $pb.GeneratedMessage { static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'SensorMetadata', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.datasync.v1'), createEmptyInstance: create) ..aOM<$44.Timestamp>(1, _omitFieldNames ? '' : 'timeRequested', subBuilder: $44.Timestamp.create) ..aOM<$44.Timestamp>(2, _omitFieldNames ? '' : 'timeReceived', subBuilder: $44.Timestamp.create) + ..e(3, _omitFieldNames ? '' : 'mimeType', $pb.PbFieldType.OE, defaultOrMaker: MimeType.MIME_TYPE_UNSPECIFIED, valueOf: MimeType.valueOf, enumValues: MimeType.values) + ..aOM<$3.Annotations>(4, _omitFieldNames ? '' : 'annotations', subBuilder: $3.Annotations.create) ..hasRequiredFields = false ; @@ -469,6 +481,26 @@ class SensorMetadata extends $pb.GeneratedMessage { void clearTimeReceived() => clearField(2); @$pb.TagNumber(2) $44.Timestamp ensureTimeReceived() => $_ensure(1); + + @$pb.TagNumber(3) + MimeType get mimeType => $_getN(2); + @$pb.TagNumber(3) + set mimeType(MimeType v) { setField(3, v); } + @$pb.TagNumber(3) + $core.bool hasMimeType() => $_has(2); + @$pb.TagNumber(3) + void clearMimeType() => clearField(3); + + @$pb.TagNumber(4) + $3.Annotations get annotations => $_getN(3); + @$pb.TagNumber(4) + set annotations($3.Annotations v) { setField(4, v); } + @$pb.TagNumber(4) + $core.bool hasAnnotations() => $_has(3); + @$pb.TagNumber(4) + void clearAnnotations() => clearField(4); + @$pb.TagNumber(4) + $3.Annotations ensureAnnotations() => $_ensure(3); } enum SensorData_Data { diff --git a/lib/src/gen/app/datasync/v1/data_sync.pbenum.dart b/lib/src/gen/app/datasync/v1/data_sync.pbenum.dart index 069075171c..d79325a0c0 100644 --- a/lib/src/gen/app/datasync/v1/data_sync.pbenum.dart +++ b/lib/src/gen/app/datasync/v1/data_sync.pbenum.dart @@ -13,6 +13,25 @@ import 'dart:core' as $core; import 'package:protobuf/protobuf.dart' as $pb; +class MimeType extends $pb.ProtobufEnum { + static const MimeType MIME_TYPE_UNSPECIFIED = MimeType._(0, _omitEnumNames ? '' : 'MIME_TYPE_UNSPECIFIED'); + static const MimeType MIME_TYPE_IMAGE_JPEG = MimeType._(1, _omitEnumNames ? '' : 'MIME_TYPE_IMAGE_JPEG'); + static const MimeType MIME_TYPE_IMAGE_PNG = MimeType._(2, _omitEnumNames ? '' : 'MIME_TYPE_IMAGE_PNG'); + static const MimeType MIME_TYPE_APPLICATION_PCD = MimeType._(3, _omitEnumNames ? '' : 'MIME_TYPE_APPLICATION_PCD'); + + static const $core.List values = [ + MIME_TYPE_UNSPECIFIED, + MIME_TYPE_IMAGE_JPEG, + MIME_TYPE_IMAGE_PNG, + MIME_TYPE_APPLICATION_PCD, + ]; + + static final $core.Map<$core.int, MimeType> _byValue = $pb.ProtobufEnum.initByValue(values); + static MimeType? valueOf($core.int value) => _byValue[value]; + + const MimeType._($core.int v, $core.String n) : super(v, n); +} + /// DataType specifies the type of data uploaded. class DataType extends $pb.ProtobufEnum { static const DataType DATA_TYPE_UNSPECIFIED = DataType._(0, _omitEnumNames ? '' : 'DATA_TYPE_UNSPECIFIED'); diff --git a/lib/src/gen/app/datasync/v1/data_sync.pbjson.dart b/lib/src/gen/app/datasync/v1/data_sync.pbjson.dart index 26a67bc4c1..b92337170b 100644 --- a/lib/src/gen/app/datasync/v1/data_sync.pbjson.dart +++ b/lib/src/gen/app/datasync/v1/data_sync.pbjson.dart @@ -13,6 +13,23 @@ import 'dart:convert' as $convert; import 'dart:core' as $core; import 'dart:typed_data' as $typed_data; +@$core.Deprecated('Use mimeTypeDescriptor instead') +const MimeType$json = { + '1': 'MimeType', + '2': [ + {'1': 'MIME_TYPE_UNSPECIFIED', '2': 0}, + {'1': 'MIME_TYPE_IMAGE_JPEG', '2': 1}, + {'1': 'MIME_TYPE_IMAGE_PNG', '2': 2}, + {'1': 'MIME_TYPE_APPLICATION_PCD', '2': 3}, + ], +}; + +/// Descriptor for `MimeType`. Decode as a `google.protobuf.EnumDescriptorProto`. +final $typed_data.Uint8List mimeTypeDescriptor = $convert.base64Decode( + 'CghNaW1lVHlwZRIZChVNSU1FX1RZUEVfVU5TUEVDSUZJRUQQABIYChRNSU1FX1RZUEVfSU1BR0' + 'VfSlBFRxABEhcKE01JTUVfVFlQRV9JTUFHRV9QTkcQAhIdChlNSU1FX1RZUEVfQVBQTElDQVRJ' + 'T05fUENEEAM='); + @$core.Deprecated('Use dataTypeDescriptor instead') const DataType$json = { '1': 'DataType', @@ -126,6 +143,8 @@ const SensorMetadata$json = { '2': [ {'1': 'time_requested', '3': 1, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'timeRequested'}, {'1': 'time_received', '3': 2, '4': 1, '5': 11, '6': '.google.protobuf.Timestamp', '10': 'timeReceived'}, + {'1': 'mime_type', '3': 3, '4': 1, '5': 14, '6': '.viam.app.datasync.v1.MimeType', '10': 'mimeType'}, + {'1': 'annotations', '3': 4, '4': 1, '5': 11, '6': '.viam.app.data.v1.Annotations', '10': 'annotations'}, ], }; @@ -133,7 +152,9 @@ const SensorMetadata$json = { final $typed_data.Uint8List sensorMetadataDescriptor = $convert.base64Decode( 'Cg5TZW5zb3JNZXRhZGF0YRJBCg50aW1lX3JlcXVlc3RlZBgBIAEoCzIaLmdvb2dsZS5wcm90b2' 'J1Zi5UaW1lc3RhbXBSDXRpbWVSZXF1ZXN0ZWQSPwoNdGltZV9yZWNlaXZlZBgCIAEoCzIaLmdv' - 'b2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBSDHRpbWVSZWNlaXZlZA=='); + 'b2dsZS5wcm90b2J1Zi5UaW1lc3RhbXBSDHRpbWVSZWNlaXZlZBI7CgltaW1lX3R5cGUYAyABKA' + '4yHi52aWFtLmFwcC5kYXRhc3luYy52MS5NaW1lVHlwZVIIbWltZVR5cGUSPwoLYW5ub3RhdGlv' + 'bnMYBCABKAsyHS52aWFtLmFwcC5kYXRhLnYxLkFubm90YXRpb25zUgthbm5vdGF0aW9ucw=='); @$core.Deprecated('Use sensorDataDescriptor instead') const SensorData$json = { diff --git a/lib/src/gen/app/v1/app.pb.dart b/lib/src/gen/app/v1/app.pb.dart index d19f4d4ca6..543caee9d9 100644 --- a/lib/src/gen/app/v1/app.pb.dart +++ b/lib/src/gen/app/v1/app.pb.dart @@ -2405,7 +2405,6 @@ class UpdateBillingServiceRequest extends $pb.GeneratedMessage { factory UpdateBillingServiceRequest({ $core.String? orgId, BillingAddress? billingAddress, - $core.String? billingSupportEmail, }) { final $result = create(); if (orgId != null) { @@ -2414,9 +2413,6 @@ class UpdateBillingServiceRequest extends $pb.GeneratedMessage { if (billingAddress != null) { $result.billingAddress = billingAddress; } - if (billingSupportEmail != null) { - $result.billingSupportEmail = billingSupportEmail; - } return $result; } UpdateBillingServiceRequest._() : super(); @@ -2426,7 +2422,6 @@ class UpdateBillingServiceRequest extends $pb.GeneratedMessage { static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'UpdateBillingServiceRequest', package: const $pb.PackageName(_omitMessageNames ? '' : 'viam.app.v1'), createEmptyInstance: create) ..aOS(1, _omitFieldNames ? '' : 'orgId') ..aOM(2, _omitFieldNames ? '' : 'billingAddress', subBuilder: BillingAddress.create) - ..aOS(3, _omitFieldNames ? '' : 'billingSupportEmail') ..hasRequiredFields = false ; @@ -2470,15 +2465,6 @@ class UpdateBillingServiceRequest extends $pb.GeneratedMessage { void clearBillingAddress() => clearField(2); @$pb.TagNumber(2) BillingAddress ensureBillingAddress() => $_ensure(1); - - @$pb.TagNumber(3) - $core.String get billingSupportEmail => $_getSZ(2); - @$pb.TagNumber(3) - set billingSupportEmail($core.String v) { $_setString(2, v); } - @$pb.TagNumber(3) - $core.bool hasBillingSupportEmail() => $_has(2); - @$pb.TagNumber(3) - void clearBillingSupportEmail() => clearField(3); } class UpdateBillingServiceResponse extends $pb.GeneratedMessage { diff --git a/lib/src/gen/app/v1/app.pbjson.dart b/lib/src/gen/app/v1/app.pbjson.dart index 60ea09f443..63118b5d2a 100644 --- a/lib/src/gen/app/v1/app.pbjson.dart +++ b/lib/src/gen/app/v1/app.pbjson.dart @@ -650,7 +650,6 @@ const UpdateBillingServiceRequest$json = { '2': [ {'1': 'org_id', '3': 1, '4': 1, '5': 9, '10': 'orgId'}, {'1': 'billing_address', '3': 2, '4': 1, '5': 11, '6': '.viam.app.v1.BillingAddress', '10': 'billingAddress'}, - {'1': 'billing_support_email', '3': 3, '4': 1, '5': 9, '10': 'billingSupportEmail'}, ], }; @@ -658,8 +657,7 @@ const UpdateBillingServiceRequest$json = { final $typed_data.Uint8List updateBillingServiceRequestDescriptor = $convert.base64Decode( 'ChtVcGRhdGVCaWxsaW5nU2VydmljZVJlcXVlc3QSFQoGb3JnX2lkGAEgASgJUgVvcmdJZBJECg' '9iaWxsaW5nX2FkZHJlc3MYAiABKAsyGy52aWFtLmFwcC52MS5CaWxsaW5nQWRkcmVzc1IOYmls' - 'bGluZ0FkZHJlc3MSMgoVYmlsbGluZ19zdXBwb3J0X2VtYWlsGAMgASgJUhNiaWxsaW5nU3VwcG' - '9ydEVtYWls'); + 'bGluZ0FkZHJlc3M='); @$core.Deprecated('Use updateBillingServiceResponseDescriptor instead') const UpdateBillingServiceResponse$json = { diff --git a/lib/src/utils.dart b/lib/src/utils.dart index 70cabbe923..478d29475c 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.358'; + const String apiTag = 'v0.1.360'; return 'flutter;$sdkVersion;$apiTag'; }