From 9905c8ed277c2fcb5b2d40333c764d6642df1ac5 Mon Sep 17 00:00:00 2001
From: "Wang,Jeff" <wangjeff@baidu.com>
Date: Tue, 24 Apr 2018 12:08:17 -0700
Subject: [PATCH 1/7] Limit embedding tag name to be embedding only

---
 visualdl/python/storage.py | 7 ++++---
 visualdl/server/visualDL   | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/visualdl/python/storage.py b/visualdl/python/storage.py
index 9e39a22ec..20de0b738 100644
--- a/visualdl/python/storage.py
+++ b/visualdl/python/storage.py
@@ -18,10 +18,12 @@
 from visualdl import core
 
 dtypes = ("float", "double", "int32", "int64")
+EMBEDDING_TAG = 'embedding'
 
 
 def check_tag_name_valid(tag):
     assert '%' not in tag, "character % is a reserved word, it is not allowed in tag."
+    assert tag != EMBEDDING_TAG, "embedding is a reserved word, it is not allowed in tag."
 
 
 def check_mode_name_valid(tag):
@@ -141,8 +143,7 @@ def text(self, tag):
         return self.reader.get_text(tag)
 
     def embedding(self, tag):
-        check_tag_name_valid(tag)
-        return self.reader.get_embedding(tag)
+        return self.reader.get_embedding(EMBEDDING_TAG)
 
     def audio(self, tag):
         """
@@ -292,7 +293,7 @@ def text(self, tag):
 
     def embedding(self, tag):
         check_tag_name_valid(tag)
-        return self.writer.new_embedding(tag)
+        return self.writer.new_embedding(EMBEDDING_TAG)
 
     def save(self):
         self.writer.save()
diff --git a/visualdl/server/visualDL b/visualdl/server/visualDL
index a7d93b83e..7c6db08c7 100644
--- a/visualdl/server/visualDL
+++ b/visualdl/server/visualDL
@@ -261,10 +261,11 @@ def texts():
 
 @app.route('/data/plugin/embeddings/embeddings')
 def embeddings():
+    tag = 'embedding'
     dimension = request.args.get('dimension')
     reduction = request.args.get('reduction')
-    key = os.path.join('/data/plugin/embeddings/embeddings', dimension, reduction)
-    data = cache_get(key, try_call, lib.get_embeddings, log_reader, 'train', 'scratch/embedding', reduction, int(dimension))
+    key = os.path.join('/data/plugin/embeddings/embeddings', tag, dimension, reduction)
+    data = cache_get(key, try_call, lib.get_embeddings, log_reader, 'train', tag, reduction, int(dimension))
     result = gen_result(0, "", data)
     return Response(json.dumps(result), mimetype='application/json')
 

From cfbf942d836a1f06e3612ca728c6f695d564000c Mon Sep 17 00:00:00 2001
From: "Wang,Jeff" <wangjeff@baidu.com>
Date: Tue, 24 Apr 2018 12:37:24 -0700
Subject: [PATCH 2/7] display the runs to the user, so they can pick which
 embedding to see

---
 .../src/high-dimensional/HighDimensional.vue  | 25 ++++++++++++++++++-
 frontend/src/high-dimensional/ui/Config.vue   | 15 +++++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/frontend/src/high-dimensional/HighDimensional.vue b/frontend/src/high-dimensional/HighDimensional.vue
index 6eb7bcef2..023f4a534 100644
--- a/frontend/src/high-dimensional/HighDimensional.vue
+++ b/frontend/src/high-dimensional/HighDimensional.vue
@@ -12,6 +12,7 @@
     <div class="visual-dl-page-right">
       <div class="visual-dl-page-config-container">
         <ui-config
+          :runs-items="runsItems"
           :config="config"
         />
       </div>
@@ -20,7 +21,7 @@
 </template>
 
 <script>
-import {getHighDimensionalDatasets} from '../service';
+import {getHighDimensionalDatasets, getRuns} from '../service';
 import autoAdjustHeight from '../common/util/autoAdjustHeight';
 import Config from './ui/Config';
 import Chart from './ui/Chart';
@@ -33,18 +34,26 @@ export default {
   name: 'HighDimensional',
   data() {
     return {
+      runsArray: [],
       config: {
         searchText: '',
         displayWordLabel: true,
         dimension: '2',
         reduction: 'tsne',
+        showingRun: '',
         running: true,
       },
       embeddingData: [],
     };
   },
   created() {
+    // TODO: Do this after we have the runsArray
     this.fetchDatasets();
+
+    getRuns().then(({errno, data}) => {
+      this.runsArray = data;
+      this.config.showingRun = data[0];
+    });
   },
   watch: {
     'config.dimension': function(val) {
@@ -53,10 +62,24 @@ export default {
     'config.reduction': function(val) {
       this.fetchDatasets();
     },
+    'config.showingRun': function(val) {
+      this.fetchDatasets();
+    },
   },
   mounted() {
     autoAdjustHeight();
   },
+  computed: {
+    runsItems() {
+      let runsArray = this.runsArray || [];
+      return runsArray.map((item) => {
+        return {
+          name: item,
+          value: item,
+        };
+      });
+    },
+  },
   methods: {
     fetchDatasets() {
       // Fetch the data from the server. Passing dimension and reduction method
diff --git a/frontend/src/high-dimensional/ui/Config.vue b/frontend/src/high-dimensional/ui/Config.vue
index 288e24ad7..bffe953be 100644
--- a/frontend/src/high-dimensional/ui/Config.vue
+++ b/frontend/src/high-dimensional/ui/Config.vue
@@ -39,6 +39,17 @@
         value="pca"/>
     </v-radio-group>
 
+    <v-radio-group
+      label="Run"
+      v-model="config.showingRun"
+      dark>
+      <v-radio
+        v-for="item in runsItems"
+        :key="item.name"
+        :label="item.name"
+        :value="item.value" />
+    </v-radio-group>
+
     <v-btn
       :color="config.running ? 'primary' : 'error'"
       v-model="config.running"
@@ -55,6 +66,10 @@
 
 export default {
   props: {
+    runsItems: {
+      type: Array,
+      required: true,
+    },
     config: {
       type: Object,
       required: true,

From d9b194f41727b7c5892d99691e28608bfdf46927 Mon Sep 17 00:00:00 2001
From: "Wang,Jeff" <wangjeff@baidu.com>
Date: Tue, 24 Apr 2018 13:39:57 -0700
Subject: [PATCH 3/7] The server now loads run parameter.

---
 frontend/src/high-dimensional/HighDimensional.vue | 1 +
 visualdl/server/visualDL                          | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frontend/src/high-dimensional/HighDimensional.vue b/frontend/src/high-dimensional/HighDimensional.vue
index 023f4a534..a807c3f98 100644
--- a/frontend/src/high-dimensional/HighDimensional.vue
+++ b/frontend/src/high-dimensional/HighDimensional.vue
@@ -86,6 +86,7 @@ export default {
       let params = {
         dimension: this.config.dimension,
         reduction: this.config.reduction,
+        run: this.config.showingRun,
       };
       getHighDimensionalDatasets(params).then(({errno, data}) => {
         let vectorData = data.embedding;
diff --git a/visualdl/server/visualDL b/visualdl/server/visualDL
index 7c6db08c7..244e11e04 100644
--- a/visualdl/server/visualDL
+++ b/visualdl/server/visualDL
@@ -261,11 +261,13 @@ def texts():
 
 @app.route('/data/plugin/embeddings/embeddings')
 def embeddings():
+    run = request.args.get('run')
     tag = 'embedding'
+
     dimension = request.args.get('dimension')
     reduction = request.args.get('reduction')
-    key = os.path.join('/data/plugin/embeddings/embeddings', tag, dimension, reduction)
-    data = cache_get(key, try_call, lib.get_embeddings, log_reader, 'train', tag, reduction, int(dimension))
+    key = os.path.join('/data/plugin/embeddings/embeddings', run, tag, dimension, reduction)
+    data = cache_get(key, try_call, lib.get_embeddings, log_reader, run, tag, reduction, int(dimension))
     result = gen_result(0, "", data)
     return Response(json.dumps(result), mimetype='application/json')
 

From 54df8fb2a6287155af760a4c97d94f8939857b83 Mon Sep 17 00:00:00 2001
From: "Wang,Jeff" <wangjeff@baidu.com>
Date: Tue, 24 Apr 2018 13:59:28 -0700
Subject: [PATCH 4/7] Remove the need of passing a tag name to embedding log
 writer and reader.

---
 visualdl/python/storage.py | 5 ++---
 visualdl/server/lib.py     | 9 ++-------
 visualdl/server/visualDL   | 6 ++----
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/visualdl/python/storage.py b/visualdl/python/storage.py
index 20de0b738..b22cb04a6 100644
--- a/visualdl/python/storage.py
+++ b/visualdl/python/storage.py
@@ -142,7 +142,7 @@ def text(self, tag):
         check_tag_name_valid(tag)
         return self.reader.get_text(tag)
 
-    def embedding(self, tag):
+    def embedding(self):
         return self.reader.get_embedding(EMBEDDING_TAG)
 
     def audio(self, tag):
@@ -291,8 +291,7 @@ def text(self, tag):
         check_tag_name_valid(tag)
         return self.writer.new_text(tag)
 
-    def embedding(self, tag):
-        check_tag_name_valid(tag)
+    def embedding(self):
         return self.writer.new_embedding(EMBEDDING_TAG)
 
     def save(self):
diff --git a/visualdl/server/lib.py b/visualdl/server/lib.py
index 155ebe2ef..edc4c4987 100644
--- a/visualdl/server/lib.py
+++ b/visualdl/server/lib.py
@@ -303,14 +303,9 @@ def get_texts(storage, mode, tag, num_records=100):
         return res
 
 
-def get_embeddings(storage,
-                   mode,
-                   tag,
-                   reduction,
-                   dimension=2,
-                   num_records=5000):
+def get_embeddings(storage, mode, reduction, dimension=2, num_records=5000):
     with storage.mode(mode) as reader:
-        embedding = reader.embedding(tag)
+        embedding = reader.embedding()
         labels = embedding.get_all_labels()
         high_dimensional_vectors = embedding.get_all_embeddings()
 
diff --git a/visualdl/server/visualDL b/visualdl/server/visualDL
index 244e11e04..eceaddf35 100644
--- a/visualdl/server/visualDL
+++ b/visualdl/server/visualDL
@@ -262,12 +262,10 @@ def texts():
 @app.route('/data/plugin/embeddings/embeddings')
 def embeddings():
     run = request.args.get('run')
-    tag = 'embedding'
-
     dimension = request.args.get('dimension')
     reduction = request.args.get('reduction')
-    key = os.path.join('/data/plugin/embeddings/embeddings', run, tag, dimension, reduction)
-    data = cache_get(key, try_call, lib.get_embeddings, log_reader, run, tag, reduction, int(dimension))
+    key = os.path.join('/data/plugin/embeddings/embeddings', run, dimension, reduction)
+    data = cache_get(key, try_call, lib.get_embeddings, log_reader, run, reduction, int(dimension))
     result = gen_result(0, "", data)
     return Response(json.dumps(result), mimetype='application/json')
 

From 228ac277f78f226ec140428f4fcba4df4af60d57 Mon Sep 17 00:00:00 2001
From: "Wang,Jeff" <wangjeff@baidu.com>
Date: Tue, 24 Apr 2018 14:17:25 -0700
Subject: [PATCH 5/7] Remove un-needed fetch

---
 frontend/src/high-dimensional/HighDimensional.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/src/high-dimensional/HighDimensional.vue b/frontend/src/high-dimensional/HighDimensional.vue
index a807c3f98..be248ec15 100644
--- a/frontend/src/high-dimensional/HighDimensional.vue
+++ b/frontend/src/high-dimensional/HighDimensional.vue
@@ -47,11 +47,10 @@ export default {
     };
   },
   created() {
-    // TODO: Do this after we have the runsArray
-    this.fetchDatasets();
-
     getRuns().then(({errno, data}) => {
       this.runsArray = data;
+
+      // Setting showingRun should trigger fetchDatasets
       this.config.showingRun = data[0];
     });
   },

From 22493889a894d9a6e542517f688f0b2add59ae8d Mon Sep 17 00:00:00 2001
From: "Wang,Jeff" <wangjeff@baidu.com>
Date: Tue, 24 Apr 2018 14:25:31 -0700
Subject: [PATCH 6/7] Use first item in the list

---
 frontend/src/high-dimensional/HighDimensional.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/high-dimensional/HighDimensional.vue b/frontend/src/high-dimensional/HighDimensional.vue
index be248ec15..789b0a806 100644
--- a/frontend/src/high-dimensional/HighDimensional.vue
+++ b/frontend/src/high-dimensional/HighDimensional.vue
@@ -51,7 +51,9 @@ export default {
       this.runsArray = data;
 
       // Setting showingRun should trigger fetchDatasets
-      this.config.showingRun = data[0];
+      if (data.length > 0) {
+        this.config.showingRun = data[0];
+      }
     });
   },
   watch: {

From 78d3ecff90294acba09a21a3376e6ae0e374b885 Mon Sep 17 00:00:00 2001
From: "Wang,Jeff" <wangjeff@baidu.com>
Date: Tue, 24 Apr 2018 14:57:30 -0700
Subject: [PATCH 7/7] rename showingRun to selectedRun

---
 frontend/src/high-dimensional/HighDimensional.vue | 10 +++++-----
 frontend/src/high-dimensional/ui/Config.vue       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frontend/src/high-dimensional/HighDimensional.vue b/frontend/src/high-dimensional/HighDimensional.vue
index 789b0a806..50872acd7 100644
--- a/frontend/src/high-dimensional/HighDimensional.vue
+++ b/frontend/src/high-dimensional/HighDimensional.vue
@@ -40,7 +40,7 @@ export default {
         displayWordLabel: true,
         dimension: '2',
         reduction: 'tsne',
-        showingRun: '',
+        selectedRun: '',
         running: true,
       },
       embeddingData: [],
@@ -50,9 +50,9 @@ export default {
     getRuns().then(({errno, data}) => {
       this.runsArray = data;
 
-      // Setting showingRun should trigger fetchDatasets
+      // Setting selectedRun should trigger fetchDatasets
       if (data.length > 0) {
-        this.config.showingRun = data[0];
+        this.config.selectedRun = data[0];
       }
     });
   },
@@ -63,7 +63,7 @@ export default {
     'config.reduction': function(val) {
       this.fetchDatasets();
     },
-    'config.showingRun': function(val) {
+    'config.selectedRun': function(val) {
       this.fetchDatasets();
     },
   },
@@ -87,7 +87,7 @@ export default {
       let params = {
         dimension: this.config.dimension,
         reduction: this.config.reduction,
-        run: this.config.showingRun,
+        run: this.config.selectedRun,
       };
       getHighDimensionalDatasets(params).then(({errno, data}) => {
         let vectorData = data.embedding;
diff --git a/frontend/src/high-dimensional/ui/Config.vue b/frontend/src/high-dimensional/ui/Config.vue
index bffe953be..e67f2cf07 100644
--- a/frontend/src/high-dimensional/ui/Config.vue
+++ b/frontend/src/high-dimensional/ui/Config.vue
@@ -41,7 +41,7 @@
 
     <v-radio-group
       label="Run"
-      v-model="config.showingRun"
+      v-model="config.selectedRun"
       dark>
       <v-radio
         v-for="item in runsItems"