Skip to content

Commit

Permalink
Merge branch 'discovery-service' of github.com:JohnN193/api into disc…
Browse files Browse the repository at this point in the history 
…overy-service
  • Loading branch information
@JohnN193
JohnN193 committed Jan 7, 2025
2 parents 12ce84b + 969bffa commit 750ec08
Show file tree
Hide file tree
Showing 10 changed files with 631 additions and 522 deletions.
251 changes: 162 additions & 89 deletions app/v1/billing.pb.go
View file

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions gen/js/app/v1/billing_pb.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,18 @@ export interface UsageCostTypeMap {
USAGE_COST_TYPE_OTHER_CLOUD_STORAGE: 7;
USAGE_COST_TYPE_PER_MACHINE: 8;
USAGE_COST_TYPE_TRIGGER_NOTIFICATION: 9;
USAGE_COST_TYPE_TABULAR_DATA_CLOUD_STORAGE: 10;
USAGE_COST_TYPE_CONFIG_HISTORY_CLOUD_STORAGE: 11;
USAGE_COST_TYPE_LOGS_CLOUD_STORAGE: 12;
USAGE_COST_TYPE_TRAINING_LOGS_CLOUD_STORAGE: 13;
USAGE_COST_TYPE_PACKAGES_CLOUD_STORAGE: 14;
USAGE_COST_TYPE_BINARY_DATA_UPLOAD: 15;
USAGE_COST_TYPE_TABULAR_DATA_UPLOAD: 16;
USAGE_COST_TYPE_LOGS_UPLOAD: 17;
USAGE_COST_TYPE_BINARY_DATA_EGRESS: 18;
USAGE_COST_TYPE_TABULAR_DATA_EGRESS: 19;
USAGE_COST_TYPE_LOGS_EGRESS: 20;
USAGE_COST_TYPE_ML_TRAINING_LOGS_EGRESS: 21;
}

export const UsageCostType: UsageCostTypeMap;
Expand Down
14 changes: 13 additions & 1 deletion gen/js/app/v1/billing_pb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3531,7 +3531,19 @@ proto.viam.app.v1.UsageCostType = {
USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE: 6,
USAGE_COST_TYPE_OTHER_CLOUD_STORAGE: 7,
USAGE_COST_TYPE_PER_MACHINE: 8,
USAGE_COST_TYPE_TRIGGER_NOTIFICATION: 9
USAGE_COST_TYPE_TRIGGER_NOTIFICATION: 9,
USAGE_COST_TYPE_TABULAR_DATA_CLOUD_STORAGE: 10,
USAGE_COST_TYPE_CONFIG_HISTORY_CLOUD_STORAGE: 11,
USAGE_COST_TYPE_LOGS_CLOUD_STORAGE: 12,
USAGE_COST_TYPE_TRAINING_LOGS_CLOUD_STORAGE: 13,
USAGE_COST_TYPE_PACKAGES_CLOUD_STORAGE: 14,
USAGE_COST_TYPE_BINARY_DATA_UPLOAD: 15,
USAGE_COST_TYPE_TABULAR_DATA_UPLOAD: 16,
USAGE_COST_TYPE_LOGS_UPLOAD: 17,
USAGE_COST_TYPE_BINARY_DATA_EGRESS: 18,
USAGE_COST_TYPE_TABULAR_DATA_EGRESS: 19,
USAGE_COST_TYPE_LOGS_EGRESS: 20,
USAGE_COST_TYPE_ML_TRAINING_LOGS_EGRESS: 21
};

/**
Expand Down
10 changes: 5 additions & 5 deletions gen/js/robot/v1/robot_pb.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -643,10 +643,10 @@ export namespace GetModelsFromModulesRequest {
}

export class GetModelsFromModulesResponse extends jspb.Message {
clearModelList(): void;
getModelList(): Array<ModuleModel>;
setModelList(value: Array<ModuleModel>): void;
addModel(value?: ModuleModel, index?: number): ModuleModel;
clearModelsList(): void;
getModelsList(): Array<ModuleModel>;
setModelsList(value: Array<ModuleModel>): void;
addModels(value?: ModuleModel, index?: number): ModuleModel;

serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): GetModelsFromModulesResponse.AsObject;
Expand All @@ -660,7 +660,7 @@ export class GetModelsFromModulesResponse extends jspb.Message {

export namespace GetModelsFromModulesResponse {
export type AsObject = {
modelList: Array<ModuleModel.AsObject>,
modelsList: Array<ModuleModel.AsObject>,
}
}

Expand Down
18 changes: 9 additions & 9 deletions gen/js/robot/v1/robot_pb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5720,7 +5720,7 @@ proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.toObject = function(o
*/
proto.viam.robot.v1.GetModelsFromModulesResponse.toObject = function(includeInstance, msg) {
var f, obj = {
modelList: jspb.Message.toObjectList(msg.getModelList(),
modelsList: jspb.Message.toObjectList(msg.getModelsList(),
proto.viam.robot.v1.ModuleModel.toObject, includeInstance)
};

Expand Down Expand Up @@ -5761,7 +5761,7 @@ proto.viam.robot.v1.GetModelsFromModulesResponse.deserializeBinaryFromReader = f
case 1:
var value = new proto.viam.robot.v1.ModuleModel;
reader.readMessage(value,proto.viam.robot.v1.ModuleModel.deserializeBinaryFromReader);
msg.addModel(value);
msg.addModels(value);
break;
default:
reader.skipField();
Expand Down Expand Up @@ -5792,7 +5792,7 @@ proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.serializeBinary = fun
*/
proto.viam.robot.v1.GetModelsFromModulesResponse.serializeBinaryToWriter = function(message, writer) {
var f = undefined;
f = message.getModelList();
f = message.getModelsList();
if (f.length > 0) {
writer.writeRepeatedMessage(
1,
Expand All @@ -5804,10 +5804,10 @@ proto.viam.robot.v1.GetModelsFromModulesResponse.serializeBinaryToWriter = funct


/**
* repeated ModuleModel model = 1;
* repeated ModuleModel models = 1;
* @return {!Array<!proto.viam.robot.v1.ModuleModel>}
*/
proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.getModelList = function() {
proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.getModelsList = function() {
return /** @type{!Array<!proto.viam.robot.v1.ModuleModel>} */ (
jspb.Message.getRepeatedWrapperField(this, proto.viam.robot.v1.ModuleModel, 1));
};
Expand All @@ -5817,7 +5817,7 @@ proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.getModelList = functi
* @param {!Array<!proto.viam.robot.v1.ModuleModel>} value
* @return {!proto.viam.robot.v1.GetModelsFromModulesResponse} returns this
*/
proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.setModelList = function(value) {
proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.setModelsList = function(value) {
return jspb.Message.setRepeatedWrapperField(this, 1, value);
};

Expand All @@ -5827,7 +5827,7 @@ proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.setModelList = functi
* @param {number=} opt_index
* @return {!proto.viam.robot.v1.ModuleModel}
*/
proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.addModel = function(opt_value, opt_index) {
proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.addModels = function(opt_value, opt_index) {
return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.viam.robot.v1.ModuleModel, opt_index);
};

Expand All @@ -5836,8 +5836,8 @@ proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.addModel = function(o
* Clears the list making it empty but non-null.
* @return {!proto.viam.robot.v1.GetModelsFromModulesResponse} returns this
*/
proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.clearModelList = function() {
return this.setModelList([]);
proto.viam.robot.v1.GetModelsFromModulesResponse.prototype.clearModelsList = function() {
return this.setModelsList([]);
};


Expand Down
10 changes: 5 additions & 5 deletions gen/js/service/discovery/v1/discovery_pb.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ export namespace DiscoverResourcesRequest {
}

export class DiscoverResourcesResponse extends jspb.Message {
clearDiscoveryList(): void;
getDiscoveryList(): Array<app_v1_robot_pb.ComponentConfig>;
setDiscoveryList(value: Array<app_v1_robot_pb.ComponentConfig>): void;
addDiscovery(value?: app_v1_robot_pb.ComponentConfig, index?: number): app_v1_robot_pb.ComponentConfig;
clearDiscoveriesList(): void;
getDiscoveriesList(): Array<app_v1_robot_pb.ComponentConfig>;
setDiscoveriesList(value: Array<app_v1_robot_pb.ComponentConfig>): void;
addDiscoveries(value?: app_v1_robot_pb.ComponentConfig, index?: number): app_v1_robot_pb.ComponentConfig;

serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): DiscoverResourcesResponse.AsObject;
Expand All @@ -51,7 +51,7 @@ export class DiscoverResourcesResponse extends jspb.Message {

export namespace DiscoverResourcesResponse {
export type AsObject = {
discoveryList: Array<app_v1_robot_pb.ComponentConfig.AsObject>,
discoveriesList: Array<app_v1_robot_pb.ComponentConfig.AsObject>,
}
}

18 changes: 9 additions & 9 deletions gen/js/service/discovery/v1/discovery_pb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.toObject = f
*/
proto.viam.service.discovery.v1.DiscoverResourcesResponse.toObject = function(includeInstance, msg) {
var f, obj = {
discoveryList: jspb.Message.toObjectList(msg.getDiscoveryList(),
discoveriesList: jspb.Message.toObjectList(msg.getDiscoveriesList(),
app_v1_robot_pb.ComponentConfig.toObject, includeInstance)
};

Expand Down Expand Up @@ -328,7 +328,7 @@ proto.viam.service.discovery.v1.DiscoverResourcesResponse.deserializeBinaryFromR
case 1:
var value = new app_v1_robot_pb.ComponentConfig;
reader.readMessage(value,app_v1_robot_pb.ComponentConfig.deserializeBinaryFromReader);
msg.addDiscovery(value);
msg.addDiscoveries(value);
break;
default:
reader.skipField();
Expand Down Expand Up @@ -359,7 +359,7 @@ proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.serializeBin
*/
proto.viam.service.discovery.v1.DiscoverResourcesResponse.serializeBinaryToWriter = function(message, writer) {
var f = undefined;
f = message.getDiscoveryList();
f = message.getDiscoveriesList();
if (f.length > 0) {
writer.writeRepeatedMessage(
1,
Expand All @@ -371,10 +371,10 @@ proto.viam.service.discovery.v1.DiscoverResourcesResponse.serializeBinaryToWrite


/**
* repeated viam.app.v1.ComponentConfig discovery = 1;
* repeated viam.app.v1.ComponentConfig discoveries = 1;
* @return {!Array<!proto.viam.app.v1.ComponentConfig>}
*/
proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.getDiscoveryList = function() {
proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.getDiscoveriesList = function() {
return /** @type{!Array<!proto.viam.app.v1.ComponentConfig>} */ (
jspb.Message.getRepeatedWrapperField(this, app_v1_robot_pb.ComponentConfig, 1));
};
Expand All @@ -384,7 +384,7 @@ proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.getDiscovery
* @param {!Array<!proto.viam.app.v1.ComponentConfig>} value
* @return {!proto.viam.service.discovery.v1.DiscoverResourcesResponse} returns this
*/
proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.setDiscoveryList = function(value) {
proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.setDiscoveriesList = function(value) {
return jspb.Message.setRepeatedWrapperField(this, 1, value);
};

Expand All @@ -394,7 +394,7 @@ proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.setDiscovery
* @param {number=} opt_index
* @return {!proto.viam.app.v1.ComponentConfig}
*/
proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.addDiscovery = function(opt_value, opt_index) {
proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.addDiscoveries = function(opt_value, opt_index) {
return jspb.Message.addToRepeatedWrapperField(this, 1, opt_value, proto.viam.app.v1.ComponentConfig, opt_index);
};

Expand All @@ -403,8 +403,8 @@ proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.addDiscovery
* Clears the list making it empty but non-null.
* @return {!proto.viam.service.discovery.v1.DiscoverResourcesResponse} returns this
*/
proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.clearDiscoveryList = function() {
return this.setDiscoveryList([]);
proto.viam.service.discovery.v1.DiscoverResourcesResponse.prototype.clearDiscoveriesList = function() {
return this.setDiscoveriesList([]);
};


Expand Down
20 changes: 16 additions & 4 deletions proto/viam/app/v1/billing.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,27 @@ message GetCurrentMonthUsageRequest {

enum UsageCostType {
USAGE_COST_TYPE_UNSPECIFIED = 0;
USAGE_COST_TYPE_DATA_UPLOAD = 1;
USAGE_COST_TYPE_DATA_EGRESS = 2;
USAGE_COST_TYPE_DATA_UPLOAD = 1 [deprecated = true];
USAGE_COST_TYPE_DATA_EGRESS = 2 [deprecated = true];
USAGE_COST_TYPE_REMOTE_CONTROL = 3;
USAGE_COST_TYPE_STANDARD_COMPUTE = 4;
USAGE_COST_TYPE_CLOUD_STORAGE = 5;
USAGE_COST_TYPE_CLOUD_STORAGE = 5 [deprecated = true];
USAGE_COST_TYPE_BINARY_DATA_CLOUD_STORAGE = 6;
USAGE_COST_TYPE_OTHER_CLOUD_STORAGE = 7;
USAGE_COST_TYPE_OTHER_CLOUD_STORAGE = 7 [deprecated = true];
USAGE_COST_TYPE_PER_MACHINE = 8;
USAGE_COST_TYPE_TRIGGER_NOTIFICATION = 9;
USAGE_COST_TYPE_TABULAR_DATA_CLOUD_STORAGE = 10;
USAGE_COST_TYPE_CONFIG_HISTORY_CLOUD_STORAGE = 11;
USAGE_COST_TYPE_LOGS_CLOUD_STORAGE = 12;
USAGE_COST_TYPE_TRAINING_LOGS_CLOUD_STORAGE = 13;
USAGE_COST_TYPE_PACKAGES_CLOUD_STORAGE = 14;
USAGE_COST_TYPE_BINARY_DATA_UPLOAD = 15;
USAGE_COST_TYPE_TABULAR_DATA_UPLOAD = 16;
USAGE_COST_TYPE_LOGS_UPLOAD = 17;
USAGE_COST_TYPE_BINARY_DATA_EGRESS = 18;
USAGE_COST_TYPE_TABULAR_DATA_EGRESS = 19;
USAGE_COST_TYPE_LOGS_EGRESS = 20;
USAGE_COST_TYPE_ML_TRAINING_LOGS_EGRESS = 21;
}

enum SourceType {
Expand Down
Loading

0 comments on commit 750ec08

Please sign in to comment.