Skip to content

Commit

Permalink
Version 10.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
YvetteZ2017 committed Mar 12, 2024
1 parent 025fac9 commit d9058aa
Show file tree
Hide file tree
Showing 16 changed files with 4,995 additions and 745 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
10.1.6
10.2.1
60 changes: 2 additions & 58 deletions google/api/client_pb.js
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ if (goog.DEBUG && !COMPILED) {
* @constructor
*/
proto.google.api.MethodSettings = function(opt_data) {
jspb.Message.initialize(this, opt_data, 0, -1, proto.google.api.MethodSettings.repeatedFields_, null);
jspb.Message.initialize(this, opt_data, 0, -1, null, null);
};
goog.inherits(proto.google.api.MethodSettings, jspb.Message);
if (goog.DEBUG && !COMPILED) {
Expand Down Expand Up @@ -3071,13 +3071,6 @@ proto.google.api.GoSettings.prototype.hasCommon = function() {



/**
* List of repeated fields within this message type.
* @private {!Array<number>}
* @const
*/
proto.google.api.MethodSettings.repeatedFields_ = [3];



if (jspb.Message.GENERATE_TO_OBJECT) {
Expand Down Expand Up @@ -3110,8 +3103,7 @@ proto.google.api.MethodSettings.prototype.toObject = function(opt_includeInstanc
proto.google.api.MethodSettings.toObject = function(includeInstance, msg) {
var f, obj = {
selector: jspb.Message.getFieldWithDefault(msg, 1, ""),
longRunning: (f = msg.getLongRunning()) && proto.google.api.MethodSettings.LongRunning.toObject(includeInstance, f),
autoPopulatedFieldsList: (f = jspb.Message.getRepeatedField(msg, 3)) == null ? undefined : f
longRunning: (f = msg.getLongRunning()) && proto.google.api.MethodSettings.LongRunning.toObject(includeInstance, f)
};

if (includeInstance) {
Expand Down Expand Up @@ -3157,10 +3149,6 @@ proto.google.api.MethodSettings.deserializeBinaryFromReader = function(msg, read
reader.readMessage(value,proto.google.api.MethodSettings.LongRunning.deserializeBinaryFromReader);
msg.setLongRunning(value);
break;
case 3:
var value = /** @type {string} */ (reader.readString());
msg.addAutoPopulatedFields(value);
break;
default:
reader.skipField();
break;
Expand Down Expand Up @@ -3205,13 +3193,6 @@ proto.google.api.MethodSettings.serializeBinaryToWriter = function(message, writ
proto.google.api.MethodSettings.LongRunning.serializeBinaryToWriter
);
}
f = message.getAutoPopulatedFieldsList();
if (f.length > 0) {
writer.writeRepeatedString(
3,
f
);
}
};


Expand Down Expand Up @@ -3553,43 +3534,6 @@ proto.google.api.MethodSettings.prototype.hasLongRunning = function() {
};


/**
* repeated string auto_populated_fields = 3;
* @return {!Array<string>}
*/
proto.google.api.MethodSettings.prototype.getAutoPopulatedFieldsList = function() {
return /** @type {!Array<string>} */ (jspb.Message.getRepeatedField(this, 3));
};


/**
* @param {!Array<string>} value
* @return {!proto.google.api.MethodSettings} returns this
*/
proto.google.api.MethodSettings.prototype.setAutoPopulatedFieldsList = function(value) {
return jspb.Message.setField(this, 3, value || []);
};


/**
* @param {string} value
* @param {number=} opt_index
* @return {!proto.google.api.MethodSettings} returns this
*/
proto.google.api.MethodSettings.prototype.addAutoPopulatedFields = function(value, opt_index) {
return jspb.Message.addToRepeatedField(this, 3, value, opt_index);
};


/**
* Clears the list making it empty but non-null.
* @return {!proto.google.api.MethodSettings} returns this
*/
proto.google.api.MethodSettings.prototype.clearAutoPopulatedFieldsList = function() {
return this.setAutoPopulatedFieldsList([]);
};


/**
* @enum {number}
*/
Expand Down
6 changes: 3 additions & 3 deletions google/api/field_behavior_pb.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ proto.google.api.fieldBehaviorList = new jspb.ExtensionFieldInfo(

google_protobuf_descriptor_pb.FieldOptions.extensionsBinary[1052] = new jspb.ExtensionFieldBinaryInfo(
proto.google.api.fieldBehaviorList,
jspb.BinaryReader.prototype.readEnum,
jspb.BinaryWriter.prototype.writeRepeatedEnum,
jspb.BinaryReader.prototype.readPackedEnum,
jspb.BinaryWriter.prototype.writePackedEnum,
undefined,
undefined,
false);
true);
// This registers the extension field with the extended class, so that
// toObject() will function correctly.
google_protobuf_descriptor_pb.FieldOptions.extensions[1052] = proto.google.api.fieldBehaviorList;
Expand Down
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": "10.1.6",
"version": "10.2.1",
"description": "The official Clarifai Node.js gRPC client",
"main": "src/index.js",
"repository": "https://github.com/Clarifai/clarifai-javascript-grpc",
Expand Down
72 changes: 61 additions & 11 deletions proto/clarifai/api/resources.proto
Original file line number Diff line number Diff line change
Expand Up @@ -1823,6 +1823,16 @@ message ModelVersion {
string train_log = 23;
}

// ModelVersionExport contains metadata for a single Model version export.
message ModelVersionExport {
// status is the current status of the dataset version export.
clarifai.api.status.Status status = 1;
// url is the URL from where the model version export can be downloaded.
string url = 2;
// size of model file
int64 size = 3;
}

// PretrainedModelConfig
message PretrainedModelConfig {
reserved 2, 5;
Expand Down Expand Up @@ -2608,7 +2618,6 @@ message Password {
}



// PasswordViolations
message PasswordViolations {
// when new password length is shorter than minimum length set
Expand Down Expand Up @@ -3072,25 +3081,22 @@ message AiAssistParameters {
repeated string concept_relation_ids = 3;
}

// TaskWorker
// TaskWorker includes information about the workers that will work on this task.
message TaskWorker {
reserved 5, 6;

// Worker strategy.
TaskWorkerStrategy strategy = 1;

// Who will work on this task.
// DEPRECATED: Use users.id instead.
// DEPRECATED: Use workers.user.id instead.
repeated string user_ids = 2 [deprecated = true];

// Users who will work on this task.
// When the 'worker.users' field is additionally requested, then all user
// info is filled for the workers. Otherwise, only the user 'id' is filled.
repeated User users = 4;

// Models that will work on this task. For Auto Annotation Tasks. Currently only supports 1 entry.
repeated Model models = 5;

// Workflows that will work on this task. For Auto Annotation Tasks. Currently only supports 1 entry.
repeated Workflow workflows = 6;
// DEPRECATED: Use workers.user instead.
repeated User users = 4 [deprecated = true];

// Info based on the worker strategy,
oneof strategy_info { TaskWorkerPartitionedStrategyInfo partitioned_strategy_info = 3; }
Expand All @@ -3107,6 +3113,16 @@ message TaskWorker {
// Each worker will label all inputs from input source.
FULL = 3;
}

// Workers that will work on this task.
//
// For Auto Annotation Tasks:
// the worker can be either a model or a workflow;
// currently only supports 1 worker.
// For manual labeling Tasks:
// the workers can only be users;
// no limitation on number of workers.
repeated Worker workers = 7;
}

// TaskWorkerPartitionedStrategyInfo
Expand Down Expand Up @@ -3229,6 +3245,30 @@ message TaskAIAssistant {
string workflow_id = 1;
}

message TaskAssignment {
string id = 1;

// Creation time.
// The format is https://www.ietf.org/rfc/rfc3339.txt.
// Example: "2006-01-02T15:04:05.999999Z".
google.protobuf.Timestamp created_at = 2;

// Most recent modification time.
// The format is https://www.ietf.org/rfc/rfc3339.txt.
// Example: "2006-01-02T15:04:05.999999Z".
google.protobuf.Timestamp modified_at = 3;

// Assigned worker.
Worker worker = 4;

// Assigned input.
Input input = 5;

// Assignment status.
// Read as: This is the status of the work assigned to worker W, on input I in task T.
clarifai.api.status.Status status = 6;
}

// TaskStatusCountPerUser can represents count of human created annotations for a user for each valid status,
// count of inputs (anchor annotation) for a user for each valid status
message TaskStatusCountPerUser {
Expand Down Expand Up @@ -3281,7 +3321,17 @@ enum AnnotationDataType {


message TaskMetrics {
uint64 estimated_labeled_inputs_count = 1;
reserved 1;

TaskWorkMetrics work = 2;
}

message TaskWorkMetrics {
// Estimated number of inputs that workers have worked on.
uint64 inputs_count_estimated = 1;
// Estimated percent of inputs that workers have worked on.
// This is a value between 0 and 100, where 0 = 0% and 100 = 100%.
uint32 inputs_percent_estimated = 2;
}

enum RoleType {
Expand Down
Loading

0 comments on commit d9058aa

Please sign in to comment.