Skip to content

Commit

Permalink
Merge pull request #34 from Clarifai/Version_7.9.0
Browse files Browse the repository at this point in the history 
Version 7.9.0
  • Loading branch information
@aleksander-clarifai
aleksander-clarifai authored Sep 29, 2021
2 parents 19d5f50 + 83d22e3 commit 9ac21cc
Show file tree
Hide file tree
Showing 14 changed files with 5,076 additions and 1,586 deletions.
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.8.0
7.9.0
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": "7.8.0",
"version": "7.9.0",
"description": "The official Clarifai Node.js gRPC client",
"main": "src/index.js",
"repository": "https://github.com/Clarifai/clarifai-javascript-grpc",
Expand Down
74 changes: 57 additions & 17 deletions proto/clarifai/api/resources.proto
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@ message App {

// data tier id this app is using.
string data_tier_id = 18;

// Is starred by the requesting user (only showed on get/list requests)
// Please use PostAppStars/DeleteAppStars endpoints to star/unstar an app
bool is_starred = 19;
// How many users have starred the app (only showed on get/list requests)
// Computed value, not editable
int32 star_count = 20;
}

message AppQuery {
Expand Down Expand Up @@ -847,6 +854,10 @@ message Input {
// This is the status at a per Input level which allows for
// partial failures.
clarifai.api.status.Status status = 6;

// List of dataset IDs that this input is part of
// Currently, this field is ONLY used in search.
repeated string dataset_ids = 7;
}

// NOTE: inconsistency: this is weird mix of plural and singular words.
Expand All @@ -865,6 +876,10 @@ message InputCount {







message WorkflowResultsSimilarity {
// The input with the specific data compare against all pool results
Input probe_input = 1;
Expand Down Expand Up @@ -996,6 +1011,16 @@ message Model {
// This field should be used for in-depth notes about
// about a model and supports up to 64Kbs.
string notes = 18;
// Tags from toolkits category
repeated string toolkits = 20 [(clarifai.api.utils.cl_show_if_empty) = true];
// Tags from use_cases category
repeated string use_cases = 21 [(clarifai.api.utils.cl_show_if_empty) = true];
// Is starred by the requesting user (only showed on get/list requests)
// Please use PostModelStars/DeleteModelStars endpoints to star/unstar a model
bool is_starred = 22;
// How many users have starred the model (only showed on get/list requests)
// Computed value, not editable
int32 star_count = 23;
}

// A link to a html/markdown/text file that stores reference material
Expand Down Expand Up @@ -1217,8 +1242,8 @@ message ModelTypeField {
ARRAY_OF_CONCEPTS_WITH_THRESHOLD = 5;
// A range for a float value.
RANGE = 7;
// If ENUM is used then the "enum_options" field should also be filled in which allows for
// additional ModelTypeFields too depending on the enum choice.
// If ENUM is used then the "enum_options" field should also be filled in with the respective ID and description
// for the different ENUM options.
ENUM = 8;
// For listing collaborators of the app. The field is a string of the collaborator's user_id.
COLLABORATORS = 9;
Expand All @@ -1231,6 +1256,9 @@ message ModelTypeField {
WORKFLOW_EMBED_MODELS = 12;
// Such as ['a', 'b', 'cantaloupe']
ARRAY_OF_STRINGS = 13;
// If RECURSIVE_ENUM is used then the "enum_options" field should also be filled in with the respective ID and description
// for the different RECURSIVE_ENUM options, as well as model_type_fields for each enum choice.
RECURSIVE_ENUM = 14;
}
// The field for this field.
ModelTypeFieldType field_type = 2;
Expand Down Expand Up @@ -1924,6 +1952,13 @@ message User {
bool two_factor_auth_enabled = 15 [deprecated = true];
uint32 teams_count = 16 [deprecated = true];

// Is starred by the requesting user (only showed on get/list requests)
// Please use PostUserStars/DeleteUserStars endpoints to star/unstar an user
bool is_starred = 21;
// How many users have starred the user (only showed on get/list requests)
// Computed value, not editable
int32 star_count = 22;


// The visibility field represents whether this message is privately/publicly visible.
// To be visible to the public the App that contains it AND the User that contains the App must
Expand Down Expand Up @@ -1951,6 +1986,8 @@ message UserDetail {
bool is_org_admin = 8;
bool two_factor_auth_enabled = 9;
uint32 teams_count = 10;
string country = 11;
string state = 12;
}

message EmailAddress {
Expand Down Expand Up @@ -2079,6 +2116,13 @@ message Workflow {

// Info about the workflow version
WorkflowVersion version = 9;

// Is starred by the requesting user (only showed on get/list requests)
// Please use PostWorkflowStars/DeleteWorkflowStars endpoints to star/unstar a workflow
bool is_starred = 10;
// How many users have starred the workflow (only showed on get/list requests)
// Computed value, not editable
int32 star_count = 11;
}

message WorkflowVersion {
Expand Down Expand Up @@ -2723,28 +2767,24 @@ enum ValidationErrorType {



enum TagCategoryName {
uncategorized = 0;

use_case = 1; // ex. tags: "faces", "food", "misc"
language = 2; // ex. tags: "en", "ar", "fi"
licence = 3; // ex. tags: "MIT", "Apache-2.0", "OSL"
toolkit = 4; // ex. tags: “HuggingFace”, "Detectron2", "OpenMMLab"
}


message TimeSegment {
// A unique id for the time segment.
string id = 1;

Data data = 2;

message TimeSegment {
Data data = 1;
TimeInfo time_info = 2;
TimeInfo time_info = 3;
}

message TimeInfo {
// Number of frames
uint32 num_frames = 1;
// Timestamp where track begins.
google.protobuf.Timestamp begin_time = 2;
uint32 begin_time = 2;
// Timestamp where track ends.
google.protobuf.Timestamp end_time = 3;
}
uint32 end_time = 3;
}



89 changes: 69 additions & 20 deletions proto/clarifai/api/resources_pb.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,12 @@ export class App extends jspb.Message {
getDataTierId(): string;
setDataTierId(value: string): App;

getIsStarred(): boolean;
setIsStarred(value: boolean): App;

getStarCount(): number;
setStarCount(value: number): App;


serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): App.AsObject;
Expand All @@ -180,6 +186,8 @@ export namespace App {
sampleMs: number,
visibility?: Visibility.AsObject,
dataTierId: string,
isStarred: boolean,
starCount: number,
}
}

Expand Down Expand Up @@ -1542,6 +1550,11 @@ export class Input extends jspb.Message {
getStatus(): proto_clarifai_api_status_status_pb.Status | undefined;
setStatus(value?: proto_clarifai_api_status_status_pb.Status): Input;

clearDatasetIdsList(): void;
getDatasetIdsList(): Array<string>;
setDatasetIdsList(value: Array<string>): Input;
addDatasetIds(value: string, index?: number): string;


serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): Input.AsObject;
Expand All @@ -1560,6 +1573,7 @@ export namespace Input {
createdAt?: google_protobuf_timestamp_pb.Timestamp.AsObject,
modifiedAt?: google_protobuf_timestamp_pb.Timestamp.AsObject,
status?: proto_clarifai_api_status_status_pb.Status.AsObject,
datasetIdsList: Array<string>,
}
}

Expand Down Expand Up @@ -1782,6 +1796,22 @@ export class Model extends jspb.Message {
getNotes(): string;
setNotes(value: string): Model;

clearToolkitsList(): void;
getToolkitsList(): Array<string>;
setToolkitsList(value: Array<string>): Model;
addToolkits(value: string, index?: number): string;

clearUseCasesList(): void;
getUseCasesList(): Array<string>;
setUseCasesList(value: Array<string>): Model;
addUseCases(value: string, index?: number): string;

getIsStarred(): boolean;
setIsStarred(value: boolean): Model;

getStarCount(): number;
setStarCount(value: number): Model;


serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): Model.AsObject;
Expand Down Expand Up @@ -1811,6 +1841,10 @@ export namespace Model {
description: string,
metadata?: google_protobuf_struct_pb.Struct.AsObject,
notes: string,
toolkitsList: Array<string>,
useCasesList: Array<string>,
isStarred: boolean,
starCount: number,
}
}

Expand Down Expand Up @@ -2250,6 +2284,7 @@ export namespace ModelTypeField {
ARRAY_OF_NUMBERS = 11,
WORKFLOW_EMBED_MODELS = 12,
ARRAY_OF_STRINGS = 13,
RECURSIVE_ENUM = 14,
}

}
Expand Down Expand Up @@ -3763,6 +3798,12 @@ export class User extends jspb.Message {
getTeamsCount(): number;
setTeamsCount(value: number): User;

getIsStarred(): boolean;
setIsStarred(value: boolean): User;

getStarCount(): number;
setStarCount(value: number): User;


hasVisibility(): boolean;
clearVisibility(): void;
Expand Down Expand Up @@ -3805,6 +3846,8 @@ export namespace User {
isOrgAdmin: boolean,
twoFactorAuthEnabled: boolean,
teamsCount: number,
isStarred: boolean,
starCount: number,
visibility?: Visibility.AsObject,
userDetail?: UserDetail.AsObject,
}
Expand Down Expand Up @@ -3855,6 +3898,12 @@ export class UserDetail extends jspb.Message {
getTeamsCount(): number;
setTeamsCount(value: number): UserDetail;

getCountry(): string;
setCountry(value: string): UserDetail;

getState(): string;
setState(value: string): UserDetail;


serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): UserDetail.AsObject;
Expand All @@ -3878,6 +3927,8 @@ export namespace UserDetail {
isOrgAdmin: boolean,
twoFactorAuthEnabled: boolean,
teamsCount: number,
country: string,
state: string,
}
}

Expand Down Expand Up @@ -4091,6 +4142,12 @@ export class Workflow extends jspb.Message {
getVersion(): WorkflowVersion | undefined;
setVersion(value?: WorkflowVersion): Workflow;

getIsStarred(): boolean;
setIsStarred(value: boolean): Workflow;

getStarCount(): number;
setStarCount(value: number): Workflow;


serializeBinary(): Uint8Array;
toObject(includeInstance?: boolean): Workflow.AsObject;
Expand All @@ -4113,6 +4170,8 @@ export namespace Workflow {
userId: string,
modifiedAt?: google_protobuf_timestamp_pb.Timestamp.AsObject,
version?: WorkflowVersion.AsObject,
isStarred: boolean,
starCount: number,
}
}

Expand Down Expand Up @@ -5187,6 +5246,9 @@ export namespace TrendingMetric {
}

export class TimeSegment extends jspb.Message {
getId(): string;
setId(value: string): TimeSegment;


hasData(): boolean;
clearData(): void;
Expand All @@ -5212,6 +5274,7 @@ export class TimeSegment extends jspb.Message {

export namespace TimeSegment {
export type AsObject = {
id: string,
data?: Data.AsObject,
timeInfo?: TimeInfo.AsObject,
}
Expand All @@ -5221,17 +5284,11 @@ export class TimeInfo extends jspb.Message {
getNumFrames(): number;
setNumFrames(value: number): TimeInfo;

getBeginTime(): number;
setBeginTime(value: number): TimeInfo;

hasBeginTime(): boolean;
clearBeginTime(): void;
getBeginTime(): google_protobuf_timestamp_pb.Timestamp | undefined;
setBeginTime(value?: google_protobuf_timestamp_pb.Timestamp): TimeInfo;


hasEndTime(): boolean;
clearEndTime(): void;
getEndTime(): google_protobuf_timestamp_pb.Timestamp | undefined;
setEndTime(value?: google_protobuf_timestamp_pb.Timestamp): TimeInfo;
getEndTime(): number;
setEndTime(value: number): TimeInfo;


serializeBinary(): Uint8Array;
Expand All @@ -5247,8 +5304,8 @@ export class TimeInfo extends jspb.Message {
export namespace TimeInfo {
export type AsObject = {
numFrames: number,
beginTime?: google_protobuf_timestamp_pb.Timestamp.AsObject,
endTime?: google_protobuf_timestamp_pb.Timestamp.AsObject,
beginTime: number,
endTime: number,
}
}

Expand Down Expand Up @@ -5319,11 +5376,3 @@ export enum ValidationErrorType {
DATABASE = 2,
FORMAT = 3,
}

export enum TagCategoryName {
UNCATEGORIZED = 0,
USE_CASE = 1,
LANGUAGE = 2,
LICENCE = 3,
TOOLKIT = 4,
}
Loading

0 comments on commit 9ac21cc

Please sign in to comment.