Skip to content

Commit

Permalink
GRPC clients version 10.10.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@clarifai-prod
clarifai-prod committed Nov 27, 2024
1 parent 378be61 commit b7804c1
Show file tree
Hide file tree
Showing 7 changed files with 74 additions and 13 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.10.1
10.10.2
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clarifai-nodejs-grpc",
"version": "10.10.1",
"version": "10.10.2",
"description": "The official Clarifai Node.js gRPC client",
"main": "src/index.js",
"repository": "https://github.com/Clarifai/clarifai-javascript-grpc",
Expand Down
2 changes: 2 additions & 0 deletions proto/clarifai/api/resources.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4820,6 +4820,8 @@ message ProcessingInfo {
// A status of the processing. We use this for signalling end of a request stream, a runner
// item's processing should be cancelled, etc.
clarifai.api.status.Status status = 2;
// Internal field to track processing. Runners will not have access to this.
string processing_id = 3;
}

enum EventType {
Expand Down
3 changes: 3 additions & 0 deletions proto/clarifai/api/resources_pb.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8612,6 +8612,8 @@ export class ProcessingInfo extends jspb.Message {
clearStatus(): void;
getStatus(): proto_clarifai_api_status_status_pb.Status | undefined;
setStatus(value?: proto_clarifai_api_status_status_pb.Status): ProcessingInfo;
getProcessingId(): string;
setProcessingId(value: string): ProcessingInfo;

serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): ProcessingInfo.AsObject;
Expand All @@ -8627,6 +8629,7 @@ export namespace ProcessingInfo {
export type AsObject = {
runnerMethodType: RunnerMethodType,
status?: proto_clarifai_api_status_status_pb.Status.AsObject,
processingId: string,
}
}

Expand Down
32 changes: 31 additions & 1 deletion proto/clarifai/api/resources_pb.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70914,7 +70914,8 @@ proto.clarifai.api.ProcessingInfo.prototype.toObject = function(opt_includeInsta
proto.clarifai.api.ProcessingInfo.toObject = function(includeInstance, msg) {
var f, obj = {
runnerMethodType: jspb.Message.getFieldWithDefault(msg, 1, 0),
status: (f = msg.getStatus()) && proto_clarifai_api_status_status_pb.Status.toObject(includeInstance, f)
status: (f = msg.getStatus()) && proto_clarifai_api_status_status_pb.Status.toObject(includeInstance, f),
processingId: jspb.Message.getFieldWithDefault(msg, 3, "")
};

if (includeInstance) {
Expand Down Expand Up @@ -70960,6 +70961,10 @@ proto.clarifai.api.ProcessingInfo.deserializeBinaryFromReader = function(msg, re
reader.readMessage(value,proto_clarifai_api_status_status_pb.Status.deserializeBinaryFromReader);
msg.setStatus(value);
break;
case 3:
var value = /** @type {string} */ (reader.readString());
msg.setProcessingId(value);
break;
default:
reader.skipField();
break;
Expand Down Expand Up @@ -71004,6 +71009,13 @@ proto.clarifai.api.ProcessingInfo.serializeBinaryToWriter = function(message, wr
proto_clarifai_api_status_status_pb.Status.serializeBinaryToWriter
);
}
f = message.getProcessingId();
if (f.length > 0) {
writer.writeString(
3,
f
);
}
};


Expand Down Expand Up @@ -71062,6 +71074,24 @@ proto.clarifai.api.ProcessingInfo.prototype.hasStatus = function() {
};


/**
* optional string processing_id = 3;
* @return {string}
*/
proto.clarifai.api.ProcessingInfo.prototype.getProcessingId = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
};


/**
* @param {string} value
* @return {!proto.clarifai.api.ProcessingInfo} returns this
*/
proto.clarifai.api.ProcessingInfo.prototype.setProcessingId = function(value) {
return jspb.Message.setProto3StringField(this, 3, value);
};



/**
* Oneof group definitions for this message. Each group defines the field
Expand Down
23 changes: 18 additions & 5 deletions proto/clarifai/api/service.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Add;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Get;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Add;
}

// Patch one or more datasets.
Expand All @@ -839,6 +840,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Add;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Get;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Add;
}

// Delete one or more datasets in a single request.
Expand Down Expand Up @@ -910,7 +912,7 @@ service V2 {
option (clarifai.auth.util.cl_auth_type) = KeyAuth;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Add;
option (clarifai.auth.util.cl_depending_scopes) = Inputs_Add;
option (clarifai.auth.util.cl_depending_scopes) = Inputs_Get;
option (clarifai.auth.util.cl_depending_scopes) = Annotations_Get;
option (clarifai.auth.util.cl_depending_scopes) = Concepts_Get;
Expand All @@ -929,8 +931,8 @@ service V2 {
option (clarifai.auth.util.cl_auth_type) = KeyAuth;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Add;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Delete;
option (clarifai.auth.util.cl_depending_scopes) = Inputs_Add;
option (clarifai.auth.util.cl_depending_scopes) = Inputs_Delete;
option (clarifai.auth.util.cl_depending_scopes) = Inputs_Get;
}

Expand Down Expand Up @@ -2545,6 +2547,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Get;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Add;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Delete;
}


Expand Down Expand Up @@ -2645,8 +2648,6 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Collaborators_Add;
option (clarifai.auth.util.cl_depending_scopes) = Collaborators_Get;
option (clarifai.auth.util.cl_depending_scopes) = Collaborators_Delete;
option (clarifai.auth.util.cl_depending_scopes) = Tasks_Add; // when deleting a collaborator, we also delete task workers associated to this collaborator
option (clarifai.auth.util.cl_depending_scopes) = Tasks_Get;
}

// Collaboration includes the app user are invitied to work on
Expand Down Expand Up @@ -3636,6 +3637,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Models_Get;
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
}
Expand All @@ -3650,6 +3652,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Models_Get;
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
}
Expand All @@ -3667,6 +3670,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand Down Expand Up @@ -3728,6 +3732,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = RunnerItems_Add;
}


// Get the training time estimate based off train request and estimated input count.
rpc PostModelVersionsTrainingTimeEstimate (PostModelVersionsTrainingTimeEstimateRequest) returns (MultiTrainingTimeEstimateResponse) {
option (google.api.http) = {
Expand Down Expand Up @@ -3812,6 +3817,7 @@ service V2 {
};
option (clarifai.auth.util.cl_auth_type) = PATAuth;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand All @@ -3821,6 +3827,7 @@ service V2 {
};
option (clarifai.auth.util.cl_auth_type) = PATAuth;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand All @@ -3832,6 +3839,7 @@ service V2 {
option (clarifai.auth.util.cl_auth_type) = PATAuth;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Add;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand All @@ -3843,6 +3851,7 @@ service V2 {
option (clarifai.auth.util.cl_auth_type) = PATAuth;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Add;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand Down Expand Up @@ -3876,6 +3885,7 @@ service V2 {
option (clarifai.auth.util.cl_auth_type) = PATAuth;
option (clarifai.auth.util.cl_depending_scopes) = Deployments_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
option (clarifai.auth.util.cl_depending_scopes) = Models_Get;
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
Expand All @@ -3891,6 +3901,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Models_Get;
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
Expand All @@ -3908,6 +3919,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand All @@ -3923,6 +3935,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand Down
23 changes: 18 additions & 5 deletions proto/clarifai/api/service_processed.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -819,6 +819,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Add;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Get;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Add;
}

// Patch one or more datasets.
Expand All @@ -839,6 +840,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Add;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Get;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Add;
}

// Delete one or more datasets in a single request.
Expand Down Expand Up @@ -910,7 +912,7 @@ service V2 {
option (clarifai.auth.util.cl_auth_type) = KeyAuth;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Add;
option (clarifai.auth.util.cl_depending_scopes) = Inputs_Add;
option (clarifai.auth.util.cl_depending_scopes) = Inputs_Get;
option (clarifai.auth.util.cl_depending_scopes) = Annotations_Get;
option (clarifai.auth.util.cl_depending_scopes) = Concepts_Get;
Expand All @@ -929,8 +931,8 @@ service V2 {
option (clarifai.auth.util.cl_auth_type) = KeyAuth;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Get;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Add;
option (clarifai.auth.util.cl_depending_scopes) = Datasets_Delete;
option (clarifai.auth.util.cl_depending_scopes) = Inputs_Add;
option (clarifai.auth.util.cl_depending_scopes) = Inputs_Delete;
option (clarifai.auth.util.cl_depending_scopes) = Inputs_Get;
}

Expand Down Expand Up @@ -2545,6 +2547,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Get;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Add;
option (clarifai.auth.util.cl_depending_scopes) = SavedSearch_Delete;
}


Expand Down Expand Up @@ -2645,8 +2648,6 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Collaborators_Add;
option (clarifai.auth.util.cl_depending_scopes) = Collaborators_Get;
option (clarifai.auth.util.cl_depending_scopes) = Collaborators_Delete;
option (clarifai.auth.util.cl_depending_scopes) = Tasks_Add; // when deleting a collaborator, we also delete task workers associated to this collaborator
option (clarifai.auth.util.cl_depending_scopes) = Tasks_Get;
}

// Collaboration includes the app user are invitied to work on
Expand Down Expand Up @@ -3636,6 +3637,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Models_Get;
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
}
Expand All @@ -3650,6 +3652,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Models_Get;
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
}
Expand All @@ -3667,6 +3670,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand Down Expand Up @@ -3728,6 +3732,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = RunnerItems_Add;
}


// Get the training time estimate based off train request and estimated input count.
rpc PostModelVersionsTrainingTimeEstimate (PostModelVersionsTrainingTimeEstimateRequest) returns (MultiTrainingTimeEstimateResponse) {
option (google.api.http) = {
Expand Down Expand Up @@ -3812,6 +3817,7 @@ service V2 {
};
option (clarifai.auth.util.cl_auth_type) = PATAuth;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand All @@ -3821,6 +3827,7 @@ service V2 {
};
option (clarifai.auth.util.cl_auth_type) = PATAuth;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand All @@ -3832,6 +3839,7 @@ service V2 {
option (clarifai.auth.util.cl_auth_type) = PATAuth;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Add;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand All @@ -3843,6 +3851,7 @@ service V2 {
option (clarifai.auth.util.cl_auth_type) = PATAuth;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Add;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand Down Expand Up @@ -3876,6 +3885,7 @@ service V2 {
option (clarifai.auth.util.cl_auth_type) = PATAuth;
option (clarifai.auth.util.cl_depending_scopes) = Deployments_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
option (clarifai.auth.util.cl_depending_scopes) = Models_Get;
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
Expand All @@ -3891,6 +3901,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Models_Get;
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
Expand All @@ -3908,6 +3919,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand All @@ -3923,6 +3935,7 @@ service V2 {
option (clarifai.auth.util.cl_depending_scopes) = Workflows_Get;
option (clarifai.auth.util.cl_depending_scopes) = Apps_Get;
option (clarifai.auth.util.cl_depending_scopes) = Nodepools_Get;
option (clarifai.auth.util.cl_depending_scopes) = InstanceTypes_Get;
option (clarifai.auth.util.cl_depending_scopes) = ComputeClusters_Get;
}

Expand Down

0 comments on commit b7804c1

Please sign in to comment.