Merge pull request #25 from zilliztech/ivf_blog

Ivf blog

federjs/Feder.js

@@ -5,7 +5,6 @@ export default class Feder {
     core = null,
     filePath = '',
     source = '',
-    projectParams = {},
     domSelector,
     viewParams = {},
   }) {
@@ -15,7 +14,7 @@ export default class Feder {
       this.initCorePromise = fetch(filePath)
         .then((res) => res.arrayBuffer())
         .then((data) => {
-          core = new FederCore({ data, source, projectParams });
+          core = new FederCore({ data, source, params: viewParams });
           this.core = core;
           const indexType = core.indexType;
           const indexMeta = core.indexMeta;
@@ -53,9 +52,25 @@ export default class Feder {
       this.federView.search({ searchRes, targetMediaUrl });
     }
   }
+  async searchById(testId = null) {
+    this.initCorePromise && (await this.initCorePromise);
+    if (!(testId in this.core.id2vector)) {
+      console.log('Invalid Id');
+    } else {
+      const testVec = this.core.id2vector[testId];
+      const targetMediaUrl =
+        this.viewParams && this.viewParams.mediaCallback
+          ? this.viewParams.mediaCallback(testId)
+          : null;
+      this.search(testVec, targetMediaUrl);
+    }
+  }
   async searchRandTestVec() {
     this.initCorePromise && (await this.initCorePromise);
-    const [testId, testVec] = await this.core.getTestIdAndVec();
+    let [testId, testVec] = await this.core.getTestIdAndVec();
+    while (isNaN(testId)) {
+      [testId, testVec] = await this.core.getTestIdAndVec();
+    }
     console.log('random test vector:', testId, testVec);
     const targetMediaUrl =
       this.viewParams && this.viewParams.mediaCallback

federjs/FederCore/index.js

@@ -7,8 +7,10 @@ export default class FederCore {
   constructor({
     data, // arraybuffer
     source,
+    params,
   }) {
     try {
+      this.params = params;
       const index = this.parserIndex(data, source);
       this.index = index;
       this.indexType = index.indexType;
@@ -56,7 +58,7 @@ export default class FederCore {
         fineSearchWithProjection = false,
         projectMethod,
         projectParams,
-      } = this.searchParams;
+      } = this.params;
       if (fineSearchWithProjection) {
         const ids = searchRes.fine.map((item) => item.id);
         this.initProjector({

federjs/FederView/HnswView/layout/overviewShortestPath.js

@@ -46,7 +46,7 @@ export default function getOverviewShortestPathData({
         SPNodesLevels[preLevel].push(preNode);
       }
     }
-    preNodeInternalId =
+    const preNodeInternalId =
       keyNode.path.length > 0 ? keyNode.path[keyNode.path.length - 1] : null;
     reachableLevel = keyLevel;
     reachableNodes = keyNode.linksLevels[keyLevel]

federjs/FederView/IvfflatView/InfoPanel/index.js

@@ -90,7 +90,6 @@ export default class InfoPanel {
       targetMediaUrl,
       listSizes,
     } = federView;
-    console.log('!!!!');
     const items = [
       {
         title: 'IVF_Flat - Search',
@@ -177,7 +176,7 @@ export default class InfoPanel {
   }
 
   updateSearchViewFineProjectOverviewInfo(federView) {
-    const { k, nprobe, searchRes, targetMediaUrl, mediaCallback } = federView;
+    const { k, nprobe, searchRes, targetMediaUrl, mediaCallback, viewParams } = federView;
     const fineAllVectorsCount = searchRes.fine.length;
     const showImages = searchRes.fsResIds
       .map((id) => mediaCallback(id))
@@ -209,7 +208,7 @@ export default class InfoPanel {
         callback: () => federView.switchSearchView('project'),
       },
       {
-        text: `Projection of all ${fineAllVectorsCount} vectors in the ${nprobe} (nprobe=${nprobe}) clusters using UMAP.`,
+        text: `Projection of all ${fineAllVectorsCount} vectors in the ${nprobe} (nprobe=${nprobe}) clusters using ${viewParams.projectMethod || 'random'}.`,
       },
       {
         images: showImages,

federjs/FederView/IvfflatView/index.js

@@ -31,6 +31,7 @@ const defaultIvfflatViewParams = {
   projectPadding: [20, 20, 20, 260],
   axisTickCount: 5,
   polarAxisStrokeWidth: 1,
+  polarAxisOpacity: 0.4,
   polarOriginBias: 0.15,
   ease: d3.easeCubic,
   animateExitTime: 1500,

federjs/FederView/IvfflatView/render/renderPolarAxis.js

@@ -8,6 +8,7 @@ export default function renderPolarAxis({
   polarMaxR,
   polarAxisStrokeWidth,
   canvasScale,
+  polarAxisOpacity,
 }) {
   const circles = d3
     .range(axisTickCount)
@@ -17,6 +18,6 @@ export default function renderPolarAxis({
     circles,
     hasStroke: true,
     lineWidth: polarAxisStrokeWidth * canvasScale,
-    strokeStyle: hexWithOpacity(ZBlue, 0.3),
+    strokeStyle: hexWithOpacity(ZBlue, polarAxisOpacity),
   });
 }

federpy/setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="federpy",
-    version="0.3.0",
+    version="0.4.0",
     author="min.tian@zilliz",
     author_email="min.tian@zilliz.com",
     description="Feder for python",

federpy/src/federpy/federpy.py

@@ -1,6 +1,7 @@
 from IPython.display import display, HTML
 import random
 
+
 class FederPy:
     def __init__(self, indexFile, indexSource, width=1000, height=620, mediaType="", mediaUrls=[]):
         self.indexFile = indexFile
@@ -49,6 +50,14 @@ def overview(self, isDisplay=True):
         else:
             return self.getHtml()
 
+    def searchById(self, targetId, isDisplay=True):
+        self.actionJs = "feder.setSearchParams(%s)\nfeder.searchById(%s)" % (
+            self.searchParams, targetId)
+        if isDisplay:
+            self.showHtml()
+        else:
+            return self.getHtml()
+
     def searchRandTestVec(self, isDisplay=True):
         self.actionJs = "feder.setSearchParams(%s)\nfeder.searchRandTestVec()" % self.searchParams
         if isDisplay: