Version 9.8.0

Clarifai · Sep 6, 2023 · 122c28f · 122c28f
1 parent c537a56
commit 122c28f
Show file tree

Hide file tree

Showing 10 changed files with 1,225 additions and 25 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-9.7.0
+9.8.0
diff --git a/google/api/field_behavior_pb.js b/google/api/field_behavior_pb.js
@@ -36,7 +36,8 @@ proto.google.api.FieldBehavior = {
   INPUT_ONLY: 4,
   IMMUTABLE: 5,
   UNORDERED_LIST: 6,
-  NON_EMPTY_DEFAULT: 7
+  NON_EMPTY_DEFAULT: 7,
+  IDENTIFIER: 8
 };
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clarifai-nodejs-grpc",
-  "version": "9.7.0",
+  "version": "9.8.0",
   "description": "The official Clarifai Node.js gRPC client",
   "main": "src/index.js",
   "repository": "https://github.com/Clarifai/clarifai-javascript-grpc",

diff --git a/proto/clarifai/api/resources.proto b/proto/clarifai/api/resources.proto
@@ -379,6 +379,9 @@ message Concept {
 
   // Information about keypoints for this concept
   KeypointInfo keypoint_info = 11;
+
+  // Optional extra info.
+  ConceptExtraInfo extra_info = 12;
 }
 
 message KeypointInfo {
@@ -394,6 +397,13 @@ message KeypointEdge {
   uint32 k2 = 2;
 }
 
+// ConceptExtraInfo represents extra information related to a concept that is context-dependent.
+// It is only set when requested in ConceptExtraInfoRequest.
+message ConceptExtraInfo {
+  // Whether this concept is rankable based on ConceptExtraInfoRequest configuration.
+  bool is_rankable = 1;
+}
+
 // ConceptCount
 message ConceptCount {
   // The concept's unique id.
@@ -1796,6 +1806,8 @@ message ConfusionMatrixEntry {
   string predicted = 1;
   string actual = 2;
   float value = 4 [(clarifai.api.utils.cl_show_if_empty) = true];
+  Concept predicted_concept = 5;
+  Concept actual_concept = 6;
 }
 
 // ConfusionMatrix

diff --git a/proto/clarifai/api/resources_pb.d.ts b/proto/clarifai/api/resources_pb.d.ts
@@ -582,6 +582,11 @@ export class Concept extends jspb.Message {
     getKeypointInfo(): KeypointInfo | undefined;
     setKeypointInfo(value?: KeypointInfo): Concept;
 
+    hasExtraInfo(): boolean;
+    clearExtraInfo(): void;
+    getExtraInfo(): ConceptExtraInfo | undefined;
+    setExtraInfo(value?: ConceptExtraInfo): Concept;
+
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): Concept.AsObject;
     static toObject(includeInstance: boolean, msg: Concept): Concept.AsObject;
@@ -605,6 +610,7 @@ export namespace Concept {
         visibility?: Visibility.AsObject,
         userId: string,
         keypointInfo?: KeypointInfo.AsObject,
+        extraInfo?: ConceptExtraInfo.AsObject,
     }
 }
 
@@ -658,6 +664,26 @@ export namespace KeypointEdge {
     }
 }
 
+export class ConceptExtraInfo extends jspb.Message { 
+    getIsRankable(): boolean;
+    setIsRankable(value: boolean): ConceptExtraInfo;
+
+    serializeBinary(): Uint8Array;
+    toObject(includeInstance?: boolean): ConceptExtraInfo.AsObject;
+    static toObject(includeInstance: boolean, msg: ConceptExtraInfo): ConceptExtraInfo.AsObject;
+    static extensions: {[key: number]: jspb.ExtensionFieldInfo<jspb.Message>};
+    static extensionsBinary: {[key: number]: jspb.ExtensionFieldBinaryInfo<jspb.Message>};
+    static serializeBinaryToWriter(message: ConceptExtraInfo, writer: jspb.BinaryWriter): void;
+    static deserializeBinary(bytes: Uint8Array): ConceptExtraInfo;
+    static deserializeBinaryFromReader(message: ConceptExtraInfo, reader: jspb.BinaryReader): ConceptExtraInfo;
+}
+
+export namespace ConceptExtraInfo {
+    export type AsObject = {
+        isRankable: boolean,
+    }
+}
+
 export class ConceptCount extends jspb.Message { 
     getId(): string;
     setId(value: string): ConceptCount;
@@ -3402,6 +3428,16 @@ export class ConfusionMatrixEntry extends jspb.Message {
     getValue(): number;
     setValue(value: number): ConfusionMatrixEntry;
 
+    hasPredictedConcept(): boolean;
+    clearPredictedConcept(): void;
+    getPredictedConcept(): Concept | undefined;
+    setPredictedConcept(value?: Concept): ConfusionMatrixEntry;
+
+    hasActualConcept(): boolean;
+    clearActualConcept(): void;
+    getActualConcept(): Concept | undefined;
+    setActualConcept(value?: Concept): ConfusionMatrixEntry;
+
     serializeBinary(): Uint8Array;
     toObject(includeInstance?: boolean): ConfusionMatrixEntry.AsObject;
     static toObject(includeInstance: boolean, msg: ConfusionMatrixEntry): ConfusionMatrixEntry.AsObject;
@@ -3417,6 +3453,8 @@ export namespace ConfusionMatrixEntry {
         predicted: string,
         actual: string,
         value: number,
+        predictedConcept?: Concept.AsObject,
+        actualConcept?: Concept.AsObject,
     }
 }