Skip to content

Commit

Permalink
GRPC clients version 9.8.1
Browse files Browse the repository at this point in the history
  • Loading branch information
clarifai-prod committed Sep 13, 2023
1 parent 031b1ee commit c9011e6
Show file tree
Hide file tree
Showing 9 changed files with 183 additions and 7 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.8.0
9.8.1
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "clarifai-nodejs-grpc",
"version": "9.8.0",
"version": "9.8.1",
"description": "The official Clarifai Node.js gRPC client",
"main": "src/index.js",
"repository": "https://github.com/Clarifai/clarifai-javascript-grpc",
Expand Down
8 changes: 8 additions & 0 deletions proto/clarifai/api/resources.proto
Original file line number Diff line number Diff line change
Expand Up @@ -1394,6 +1394,8 @@ message TrainInfo {
// defined for each ModelType as a Struct (JSON object) here. During training, the settings
// contained within are sent to the training processor to alter the training process.
google.protobuf.Struct params = 1;
// The dataset and dataset version this model version was or will be trained on
Dataset dataset = 2;
}

message EvalInfo {
Expand Down Expand Up @@ -1589,6 +1591,10 @@ message ModelTypeField {
DATASET_VERSION_ID = 17;
// For auto-completing to concepts in the model.
ARRAY_OF_MODEL_CONCEPTS = 18;
// For selecting a dataset
DATASET = 19;
// For selecting a dataset version
DATASET_VERSION = 20;
}
// The field for this field.
ModelTypeFieldType field_type = 2;
Expand Down Expand Up @@ -1743,6 +1749,7 @@ message ModelVersion {
TrainInfo train_info = 21;
// Configuration used to import model from third-party toolkits
ImportInfo import_info = 22;
// Contains the training logs if available
string train_log = 23;
}

Expand Down Expand Up @@ -3192,6 +3199,7 @@ message APIPostModelOutputsCollectorSource {

// This is a private field that defaults to the app owner for public users.
// If this is left blank then this collector will collect from ALL users calling the given model.
string caller_user_id = 6;
}

// StatValue
Expand Down
11 changes: 11 additions & 0 deletions proto/clarifai/api/resources_pb.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2659,6 +2659,11 @@ export class TrainInfo extends jspb.Message {
getParams(): google_protobuf_struct_pb.Struct | undefined;
setParams(value?: google_protobuf_struct_pb.Struct): TrainInfo;

hasDataset(): boolean;
clearDataset(): void;
getDataset(): Dataset | undefined;
setDataset(value?: Dataset): TrainInfo;

serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): TrainInfo.AsObject;
static toObject(includeInstance: boolean, msg: TrainInfo): TrainInfo.AsObject;
Expand All @@ -2672,6 +2677,7 @@ export class TrainInfo extends jspb.Message {
export namespace TrainInfo {
export type AsObject = {
params?: google_protobuf_struct_pb.Struct.AsObject,
dataset?: Dataset.AsObject,
}
}

Expand Down Expand Up @@ -3008,6 +3014,8 @@ export namespace ModelTypeField {
DATASET_ID = 16,
DATASET_VERSION_ID = 17,
ARRAY_OF_MODEL_CONCEPTS = 18,
DATASET = 19,
DATASET_VERSION = 20,
}

}
Expand Down Expand Up @@ -5854,6 +5862,8 @@ export class APIPostModelOutputsCollectorSource extends jspb.Message {
setModelVersionId(value: string): APIPostModelOutputsCollectorSource;
getPostInputsKeyId(): string;
setPostInputsKeyId(value: string): APIPostModelOutputsCollectorSource;
getCallerUserId(): string;
setCallerUserId(value: string): APIPostModelOutputsCollectorSource;

serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): APIPostModelOutputsCollectorSource.AsObject;
Expand All @@ -5872,6 +5882,7 @@ export namespace APIPostModelOutputsCollectorSource {
modelId: string,
modelVersionId: string,
postInputsKeyId: string,
callerUserId: string,
}
}

Expand Down
89 changes: 86 additions & 3 deletions proto/clarifai/api/resources_pb.js
Original file line number Diff line number Diff line change
Expand Up @@ -24913,7 +24913,8 @@ proto.clarifai.api.TrainInfo.prototype.toObject = function(opt_includeInstance)
*/
proto.clarifai.api.TrainInfo.toObject = function(includeInstance, msg) {
var f, obj = {
params: (f = msg.getParams()) && google_protobuf_struct_pb.Struct.toObject(includeInstance, f)
params: (f = msg.getParams()) && google_protobuf_struct_pb.Struct.toObject(includeInstance, f),
dataset: (f = msg.getDataset()) && proto.clarifai.api.Dataset.toObject(includeInstance, f)
};

if (includeInstance) {
Expand Down Expand Up @@ -24955,6 +24956,11 @@ proto.clarifai.api.TrainInfo.deserializeBinaryFromReader = function(msg, reader)
reader.readMessage(value,google_protobuf_struct_pb.Struct.deserializeBinaryFromReader);
msg.setParams(value);
break;
case 2:
var value = new proto.clarifai.api.Dataset;
reader.readMessage(value,proto.clarifai.api.Dataset.deserializeBinaryFromReader);
msg.setDataset(value);
break;
default:
reader.skipField();
break;
Expand Down Expand Up @@ -24992,6 +24998,14 @@ proto.clarifai.api.TrainInfo.serializeBinaryToWriter = function(message, writer)
google_protobuf_struct_pb.Struct.serializeBinaryToWriter
);
}
f = message.getDataset();
if (f != null) {
writer.writeMessage(
2,
f,
proto.clarifai.api.Dataset.serializeBinaryToWriter
);
}
};


Expand Down Expand Up @@ -25032,6 +25046,43 @@ proto.clarifai.api.TrainInfo.prototype.hasParams = function() {
};


/**
* optional Dataset dataset = 2;
* @return {?proto.clarifai.api.Dataset}
*/
proto.clarifai.api.TrainInfo.prototype.getDataset = function() {
return /** @type{?proto.clarifai.api.Dataset} */ (
jspb.Message.getWrapperField(this, proto.clarifai.api.Dataset, 2));
};


/**
* @param {?proto.clarifai.api.Dataset|undefined} value
* @return {!proto.clarifai.api.TrainInfo} returns this
*/
proto.clarifai.api.TrainInfo.prototype.setDataset = function(value) {
return jspb.Message.setWrapperField(this, 2, value);
};


/**
* Clears the message field making it undefined.
* @return {!proto.clarifai.api.TrainInfo} returns this
*/
proto.clarifai.api.TrainInfo.prototype.clearDataset = function() {
return this.setDataset(undefined);
};


/**
* Returns whether this field is set.
* @return {boolean}
*/
proto.clarifai.api.TrainInfo.prototype.hasDataset = function() {
return jspb.Message.getField(this, 2) != null;
};





Expand Down Expand Up @@ -27422,7 +27473,9 @@ proto.clarifai.api.ModelTypeField.ModelTypeFieldType = {
PYTHON_CODE: 15,
DATASET_ID: 16,
DATASET_VERSION_ID: 17,
ARRAY_OF_MODEL_CONCEPTS: 18
ARRAY_OF_MODEL_CONCEPTS: 18,
DATASET: 19,
DATASET_VERSION: 20
};

/**
Expand Down Expand Up @@ -49835,7 +49888,8 @@ proto.clarifai.api.APIPostModelOutputsCollectorSource.toObject = function(includ
modelAppId: jspb.Message.getFieldWithDefault(msg, 2, ""),
modelId: jspb.Message.getFieldWithDefault(msg, 3, ""),
modelVersionId: jspb.Message.getFieldWithDefault(msg, 4, ""),
postInputsKeyId: jspb.Message.getFieldWithDefault(msg, 5, "")
postInputsKeyId: jspb.Message.getFieldWithDefault(msg, 5, ""),
callerUserId: jspb.Message.getFieldWithDefault(msg, 6, "")
};

if (includeInstance) {
Expand Down Expand Up @@ -49892,6 +49946,10 @@ proto.clarifai.api.APIPostModelOutputsCollectorSource.deserializeBinaryFromReade
var value = /** @type {string} */ (reader.readString());
msg.setPostInputsKeyId(value);
break;
case 6:
var value = /** @type {string} */ (reader.readString());
msg.setCallerUserId(value);
break;
default:
reader.skipField();
break;
Expand Down Expand Up @@ -49956,6 +50014,13 @@ proto.clarifai.api.APIPostModelOutputsCollectorSource.serializeBinaryToWriter =
f
);
}
f = message.getCallerUserId();
if (f.length > 0) {
writer.writeString(
6,
f
);
}
};


Expand Down Expand Up @@ -50049,6 +50114,24 @@ proto.clarifai.api.APIPostModelOutputsCollectorSource.prototype.setPostInputsKey
};


/**
* optional string caller_user_id = 6;
* @return {string}
*/
proto.clarifai.api.APIPostModelOutputsCollectorSource.prototype.getCallerUserId = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
};


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



/**
* List of repeated fields within this message type.
Expand Down
4 changes: 4 additions & 0 deletions proto/clarifai/api/service.proto
Original file line number Diff line number Diff line change
Expand Up @@ -3983,6 +3983,8 @@ message ListConceptsRequest {
// (optional URL parameter) The number of results that will be contained in each page. Defaults
// to 128.
uint32 per_page = 3;
// Fuzzy match on concept ID
string id = 4;
}

// ListModelConceptsRequest
Expand Down Expand Up @@ -4438,6 +4440,8 @@ message ListDatasetsRequest {
}
// Filter datasets by bookmark. If set, only return bookmarked datasets. Otherwise none bookmarked datasets only.
bool bookmark = 10;
// Fuzzy filter on dataset ID
string id = 12;
}

// GetDatasetRequest
Expand Down
6 changes: 6 additions & 0 deletions proto/clarifai/api/service_pb.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1082,6 +1082,8 @@ export class ListConceptsRequest extends jspb.Message {
setPage(value: number): ListConceptsRequest;
getPerPage(): number;
setPerPage(value: number): ListConceptsRequest;
getId(): string;
setId(value: string): ListConceptsRequest;

serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): ListConceptsRequest.AsObject;
Expand All @@ -1098,6 +1100,7 @@ export namespace ListConceptsRequest {
userAppId?: proto_clarifai_api_resources_pb.UserAppIDSet.AsObject,
page: number,
perPage: number,
id: string,
}
}

Expand Down Expand Up @@ -2305,6 +2308,8 @@ export class ListDatasetsRequest extends jspb.Message {
setSortById(value: boolean): ListDatasetsRequest;
getBookmark(): boolean;
setBookmark(value: boolean): ListDatasetsRequest;
getId(): string;
setId(value: string): ListDatasetsRequest;

getSortByCase(): ListDatasetsRequest.SortByCase;

Expand All @@ -2331,6 +2336,7 @@ export namespace ListDatasetsRequest {
sortByModifiedAt: boolean,
sortById: boolean,
bookmark: boolean,
id: string,
}

export enum SortByCase {
Expand Down
Loading

0 comments on commit c9011e6

Please sign in to comment.