#6970: add metadata to message content (#7004)

twosigma · Mar 21, 2018 · 137a3ea · 137a3ea
1 parent 9172e6d
commit 137a3ea
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/kernel/base/src/main/java/com/twosigma/beakerx/Display.java b/kernel/base/src/main/java/com/twosigma/beakerx/Display.java
@@ -27,6 +27,7 @@
 
 import static com.twosigma.beakerx.evaluator.InternalVariable.getParentHeader;
 import static com.twosigma.beakerx.kernel.comm.Comm.DATA;
+import static com.twosigma.beakerx.kernel.comm.Comm.METADATA;
 import static com.twosigma.beakerx.kernel.msg.JupyterMessages.DISPLAY_DATA;
 import static java.util.Collections.singletonList;
 
@@ -44,6 +45,7 @@ private static void displayMIMEContainers(List<MIMEContainer> result) {
     HashMap<String, Object> data = new HashMap<>();
     result.forEach(x -> data.put(x.getMime().asString(), x.getData()));
     content.put(DATA, data);
+    content.put(METADATA,new HashMap<>());
     Message message = Comm.messageMessage(DISPLAY_DATA, Comm.Buffer.EMPTY, content, getParentHeader());
     KernelManager.get().publish(singletonList(message));
   }

diff --git a/kernel/base/src/test/java/com/twosigma/beakerx/DisplayTest.java b/kernel/base/src/test/java/com/twosigma/beakerx/DisplayTest.java
@@ -27,6 +27,7 @@
 
 import java.util.stream.Collectors;
 
+import static com.twosigma.beakerx.kernel.comm.Comm.METADATA;
 import static com.twosigma.beakerx.widget.TestWidgetUtils.getData;
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -75,4 +76,14 @@ private void verifyWidget() {
             .collect(Collectors.toList()).get(0);
     assertThat(getData(message).get(Widget.APPLICATION_VND_JUPYTER_WIDGET_VIEW_JSON)).isNotNull();
   }
+
+  @Test
+  public void contentShouldContainMetadata() {
+    //given
+    //when
+    Display.display("Hello");
+    //then
+    Message message = kernel.getPublishedMessages().get(0);
+    assertThat(message.getContent().get(METADATA)).isNotNull();
+  }
 }
diff --git a/test/ipynb/groovy/GeneralDisplayMethod.ipynb b/test/ipynb/groovy/GeneralDisplayMethod.ipynb
@@ -6,11 +6,12 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "import com.twosigma.beakerx.widget.integers.IntSlider\n",
-    "import com.twosigma.beakerx.widget.integers.IntProgress\n",
+    "import com.twosigma.beakerx.widget.IntSlider\n",
+    "import com.twosigma.beakerx.widget.IntProgress\n",
     "\n",
     "slider = new IntSlider()\n",
     "progress = new IntProgress()\n",
+    "progress.value = 10\n",
     "\n",
     "def mapList = [\n",
     "   [a:1, b:2, c:3],\n",
@@ -36,6 +37,13 @@
     "display(\"Hello3\")\n",
     "\"done\""
    ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": []
   }
  ],
  "metadata": {