Add metric for Descriptors

IntelLabs · Feb 20, 2019 · a5503e8 · a5503e8
1 parent 3fc9140
commit a5503e8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/src/DescriptorsCommand.cc b/src/DescriptorsCommand.cc
@@ -509,6 +509,7 @@ int FindDescriptor::construct_protobuf(
         constraints[VDMS_DESC_LABEL_PROP] = constraints["_label"];
         constraints.removeMember("_label");
     }
+
     if (constraints.isMember("_id")) {
         constraints[VDMS_DESC_ID_PROP] = constraints["_id"];
         constraints.removeMember("_id");
@@ -581,12 +582,15 @@ int FindDescriptor::construct_protobuf(
         Json::Value link_to_set;
         link_to_set["ref"] = ref_set;
 
+        Json::Value res_desc = results;
+        res_desc["list"].append(VDMS_DESC_ID_PROP);
+
         // Query for the Descriptors related to that set
         // that match the user-defined constraints
         query.QueryNode(
             get_value<int>(cmd, "_ref", -1),
             VDMS_DESC_TAG,
-            link_to_set, constraints, results, false);
+            link_to_set, constraints, res_desc, false);
     }
     // Case (3), Just want the descriptor by value, we only need the set
     else {
@@ -643,7 +647,7 @@ int FindDescriptor::construct_protobuf(
                 }
             }
 
-            // This are needed to construct the response.
+            // These are needed to construct the response.
             if (!results.isMember("list")) {
                 results["list"].append(VDMS_DESC_LABEL_PROP);
                 results["list"].append(VDMS_DESC_ID_PROP);

diff --git a/utils/src/api_schema/api_schema.json b/utils/src/api_schema/api_schema.json
@@ -102,6 +102,16 @@
       "enum": ["png", "jpg"]
     },
 
+    "metricFormatString": {
+      "type": "string",
+      "enum": ["L2", "IP"]
+    },
+
+    "engineFormatString": {
+      "type": "string",
+      "enum": ["FaissFlat", "FaissIVFFlat", "TileDBDense", "TileDBSparse"]
+    },
+
     "vidCodecString": {
       "type": "string",
       "enum": ["xvid", "h264", "h263"]
@@ -534,6 +544,8 @@
       "properties": {
         "name":       { "type": "string" },
         "dimensions": { "$ref": "#/definitions/refInt" },
+        "metric":     { "$ref": "#/definitions/metricFormatString" },
+        "engine":     { "$ref": "#/definitions/engineFormatString" },
         "link":       { "$ref": "#/definitions/blockLink" },
         "properties": { "type": "object" }
       },