-
Notifications
You must be signed in to change notification settings - Fork 381
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
1 parent
bf5251c
commit 9843340
Showing
11 changed files
with
218 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 57 additions & 0 deletions
57
kernel/base/src/main/java/com/twosigma/beakerx/Display.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| /* | ||
| * Copyright 2018 TWO SIGMA OPEN SOURCE, LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.twosigma.beakerx; | ||
|
|
||
| import com.twosigma.beakerx.kernel.KernelManager; | ||
| import com.twosigma.beakerx.kernel.comm.Comm; | ||
| import com.twosigma.beakerx.message.Message; | ||
| import com.twosigma.beakerx.mimetype.MIMEContainer; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.util.HashMap; | ||
| import java.util.List; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| import static com.twosigma.beakerx.evaluator.InternalVariable.getParentHeader; | ||
| import static com.twosigma.beakerx.kernel.comm.Comm.DATA; | ||
| import static com.twosigma.beakerx.kernel.msg.JupyterMessages.DISPLAY_DATA; | ||
| import static java.util.Collections.singletonList; | ||
|
|
||
| public class Display { | ||
|
|
||
| public static void display(Object value) { | ||
| List<MIMEContainer> result = getMIMEContainers(value); | ||
| if (!result.isEmpty()) { | ||
| displayMIMEContainers(result); | ||
| } | ||
| } | ||
|
|
||
| private static void displayMIMEContainers(List<MIMEContainer> result) { | ||
| HashMap<String, Serializable> content = new HashMap<>(); | ||
| HashMap<String, Object> data = new HashMap<>(); | ||
| result.forEach(x -> data.put(x.getMime().asString(), x.getData())); | ||
| content.put(DATA, data); | ||
| Message message = Comm.messageMessage(DISPLAY_DATA, Comm.Buffer.EMPTY, content, getParentHeader()); | ||
| KernelManager.get().publish(singletonList(message)); | ||
| } | ||
|
|
||
| private static List<MIMEContainer> getMIMEContainers(Object value) { | ||
| List<MIMEContainer> containers = MIMEContainerFactory.createMIMEContainers(value); | ||
| return containers.stream() | ||
| .filter(x -> !x.getMime().asString().equals(MIMEContainer.MIME.HIDDEN)).collect(Collectors.toList()); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
kernel/base/src/test/java/com/twosigma/beakerx/DisplayTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| /* | ||
| * Copyright 2018 TWO SIGMA OPEN SOURCE, LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.twosigma.beakerx; | ||
|
|
||
| import com.twosigma.beakerx.kernel.KernelManager; | ||
| import com.twosigma.beakerx.kernel.msg.JupyterMessages; | ||
| import com.twosigma.beakerx.message.Message; | ||
| import com.twosigma.beakerx.mimetype.MIMEContainer; | ||
| import com.twosigma.beakerx.widget.Widget; | ||
| import com.twosigma.beakerx.widget.integers.IntSlider; | ||
| import org.junit.After; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.stream.Collectors; | ||
|
|
||
| import static com.twosigma.beakerx.widget.TestWidgetUtils.getData; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| public class DisplayTest { | ||
|
|
||
| private KernelTest kernel; | ||
|
|
||
| @Before | ||
| public void setUp() throws Exception { | ||
| kernel = new KernelTest(); | ||
| KernelManager.register(kernel); | ||
| } | ||
|
|
||
| @After | ||
| public void tearDown() throws Exception { | ||
| KernelManager.register(null); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldSendMessageForText() { | ||
| //given | ||
| //when | ||
| Display.display("Hello"); | ||
| //then | ||
| verifyText(); | ||
| } | ||
|
|
||
| private void verifyText() { | ||
| Message message = kernel.getPublishedMessages().get(0); | ||
| assertThat(message.type()).isEqualTo(JupyterMessages.DISPLAY_DATA); | ||
| assertThat(getData(message).get(MIMEContainer.MIME.TEXT_PLAIN)).isEqualTo("Hello"); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldSendMessageForWidget() { | ||
| //given | ||
| //when | ||
| Display.display(new IntSlider()); | ||
| //then | ||
| verifyWidget(); | ||
| } | ||
|
|
||
| private void verifyWidget() { | ||
| Message message = kernel.getPublishedMessages().stream() | ||
| .filter(x -> x.type().equals(JupyterMessages.DISPLAY_DATA)) | ||
| .collect(Collectors.toList()).get(0); | ||
| assertThat(getData(message).get(Widget.APPLICATION_VND_JUPYTER_WIDGET_VIEW_JSON)).isNotNull(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| { | ||
| "cells": [ | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "metadata": {}, | ||
| "outputs": [], | ||
| "source": [ | ||
| "import com.twosigma.beakerx.widget.integers.IntSlider\n", | ||
| "import com.twosigma.beakerx.widget.integers.IntProgress\n", | ||
| "\n", | ||
| "slider = new IntSlider()\n", | ||
| "progress = new IntProgress()\n", | ||
| "\n", | ||
| "def mapList = [\n", | ||
| " [a:1, b:2, c:3],\n", | ||
| " [a:4, b:5, c:6],\n", | ||
| " [a:7, b:8, c:5]\n", | ||
| "]\n", | ||
| "table1 = new TableDisplay(mapList)\n", | ||
| "OutputCell.HIDDEN" | ||
| ] | ||
| }, | ||
| { | ||
| "cell_type": "code", | ||
| "execution_count": null, | ||
| "metadata": {}, | ||
| "outputs": [], | ||
| "source": [ | ||
| "display(\"Hello1\")\n", | ||
| "display(slider)\n", | ||
| "display(Latex('$\\\\alpha^2 + \\\\eta$'))\n", | ||
| "display(progress)\n", | ||
| "display(YoutubeVideo(\"gSVvxOchT8Y\"))\n", | ||
| "display(table1)\n", | ||
| "display(\"Hello3\")\n", | ||
| "\"done\"" | ||
| ] | ||
| } | ||
| ], | ||
| "metadata": { | ||
| "kernelspec": { | ||
| "display_name": "Groovy", | ||
| "language": "groovy", | ||
| "name": "groovy" | ||
| }, | ||
| "language_info": { | ||
| "codemirror_mode": "groovy", | ||
| "file_extension": ".groovy", | ||
| "mimetype": "", | ||
| "name": "Groovy", | ||
| "nbconverter_exporter": "", | ||
| "version": "2.4.3" | ||
| } | ||
| }, | ||
| "nbformat": 4, | ||
| "nbformat_minor": 2 | ||
| } |