MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

simplified websocket connection in ipython notebook

Browse Source 
partly fixed PY-15404
This commit is contained in:
Ekaterina Tuzova
2015-04-27 16:33:49 +03:00
parent 55580c696d
commit 5b16ccda49
2 changed files with 74 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java
+73 -71
View File
@@ -78,61 +78,7 @@ public class IpnbConnection {
myShellThread = new Thread(myShellClient);
myShellThread.start();
myIOPubClient = new WebSocketClient(getIOPubURI(), draft) {
private ArrayList<IpnbOutputCell> myOutput = new ArrayList<IpnbOutputCell>();
private Integer myExecCount = null;
@Override
public void onOpen(ServerHandshake handshakeData) {
send(authMessage);
myIsIOPubOpen = true;
notifyOpen();
}
@Override
public void onMessage(String message) {
final Gson gson = new Gson();
final Message msg = gson.fromJson(message, Message.class);
final Header header = msg.getHeader();
final Header parentHeader = gson.fromJson(msg.getParentHeader(), Header.class);
final String messageType = header.getMessageType();
if ("pyout".equals(messageType) || "display_data".equals(messageType)) {
final PyOutContent content = gson.fromJson(msg.getContent(), PyOutContent.class);
addCellOutput(content, myOutput);
}
else if ("pyerr".equals(messageType) || "error".equals(messageType)) {
final PyErrContent content = gson.fromJson(msg.getContent(), PyErrContent.class);
addCellOutput(content, myOutput);
}
else if ("stream".equals(messageType)) {
final PyStreamContent content = gson.fromJson(msg.getContent(), PyStreamContent.class);
addCellOutput(content, myOutput);
}
else if ("pyin".equals(messageType) || "execute_input".equals(messageType)) {
final JsonElement executionCount = msg.getContent().get("execution_count");
if (executionCount != null) {
myExecCount = executionCount.getAsInt();
}
}
else if ("status".equals(messageType)) {
final PyStatusContent content = gson.fromJson(msg.getContent(), PyStatusContent.class);
if (content.getExecutionState().equals("idle")) {
//noinspection unchecked
myListener.onOutput(IpnbConnection.this, parentHeader.getMessageId(), (List<IpnbOutputCell>)myOutput.clone(), myExecCount);
myOutput.clear();
}
}
}
@Override
public void onClose(int code, String reason, boolean remote) {
}
@Override
public void onError(Exception ex) {
}
};
myIOPubClient = new IpnbWebSocketClient(getIOPubURI(), draft);
myIOPubThread = new Thread(myIOPubClient);
myIOPubThread.start();
}
@@ -334,35 +280,30 @@ public class IpnbConnection {
output.add(new IpnbStreamOutputCell(((PyStreamContent)content).getName(), new String[]{data}, null));
}
else if (content instanceof PyOutContent) {
final Map<String, String> data = ((PyOutContent)content).getData();
final Map<String, Object> data = ((PyOutContent)content).getData();
final String plainText = (String)data.get("text/plain");
if (data.containsKey("text/latex")) {
final String text = data.get("text/latex");
final String plainText = data.get("text/plain");
final String text = (String)data.get("text/latex");
output.add(new IpnbLatexOutputCell(new String[]{text}, null, new String[]{plainText}));
}
else if (data.containsKey("text/html")) {
final String html = data.get("text/html");
final String html = (String)data.get("text/html");
output.add(new IpnbHtmlOutputCell(StringUtil.splitByLinesKeepSeparators(html), StringUtil.splitByLinesKeepSeparators(html), null));
}
else if (data.containsKey("image/png")) {
final String png = data.get("image/png");
final String plainText = data.get("text/plain");
final String png = (String)data.get("image/png");
output.add(new IpnbPngOutputCell(png, StringUtil.splitByLinesKeepSeparators(plainText), null));
}
else if (data.containsKey("image/jpeg")) {
final String jpeg = data.get("image/jpeg");
final String plainText = data.get("text/plain");
final String jpeg = (String)data.get("image/jpeg");
output.add(new IpnbJpegOutputCell(jpeg, StringUtil.splitByLinesKeepSeparators(plainText), null));
}
else if (data.containsKey("image/svg")) {
final String svg = data.get("image/svg");
final String plainText = data.get("text/plain");
final String svg = (String)data.get("image/svg");
output.add(new IpnbSvgOutputCell(StringUtil.splitByLinesKeepSeparators(svg), StringUtil.splitByLinesKeepSeparators(plainText), null));
}
else {
for (Map.Entry<String, String> entry : data.entrySet()) {
output.add(new IpnbOutOutputCell(new String[]{entry.getValue()}, null));
}
else if (plainText != null){
output.add(new IpnbOutOutputCell(new String[]{plainText}, null));
}
}
}
@@ -372,14 +313,14 @@ public class IpnbConnection {
@SuppressWarnings("UnusedDeclaration")
protected static class PyOutContent implements PyContent {
private int execution_count;
private HashMap<String, String> data;
private HashMap<String, Object> data;
private JsonObject metadata;
public int getExecutionCount() {
return execution_count;
}
public Map<String, String> getData() {
public Map<String, Object> getData() {
return data;
}
@@ -445,4 +386,65 @@ public class IpnbConnection {
return request;
}
}
protected class IpnbWebSocketClient extends WebSocketClient {
private ArrayList<IpnbOutputCell> myOutput = new ArrayList<IpnbOutputCell>();
private Integer myExecCount = null;
IpnbWebSocketClient(URI serverUri, Draft draft) {
super(serverUri, draft);
}
@Override
public void onOpen(ServerHandshake handshakeData) {
send(authMessage);
myIsIOPubOpen = true;
notifyOpen();
}
@Override
public void onMessage(String message) {
final Gson gson = new Gson();
final Message msg = gson.fromJson(message, Message.class);
final Header header = msg.getHeader();
final Header parentHeader = gson.fromJson(msg.getParentHeader(), Header.class);
final String messageType = header.getMessageType();
if ("pyout".equals(messageType) || "display_data".equals(messageType) || "execute_result".equals(messageType)) {
final PyOutContent content = gson.fromJson(msg.getContent(), PyOutContent.class);
addCellOutput(content, myOutput);
}
else if ("pyerr".equals(messageType) || "error".equals(messageType)) {
final PyErrContent content = gson.fromJson(msg.getContent(), PyErrContent.class);
addCellOutput(content, myOutput);
}
else if ("stream".equals(messageType)) {
final PyStreamContent content = gson.fromJson(msg.getContent(), PyStreamContent.class);
addCellOutput(content, myOutput);
}
else if ("pyin".equals(messageType) || "execute_input".equals(messageType)) {
final JsonElement executionCount = msg.getContent().get("execution_count");
if (executionCount != null) {
myExecCount = executionCount.getAsInt();
}
}
else if ("status".equals(messageType)) {
final PyStatusContent content = gson.fromJson(msg.getContent(), PyStatusContent.class);
if (content.getExecutionState().equals("idle")) {
//noinspection unchecked
myListener.onOutput(IpnbConnection.this, parentHeader.getMessageId(), (List<IpnbOutputCell>)myOutput.clone(), myExecCount);
myOutput.clear();
}
}
}
@Override
public void onClose(int code, String reason, boolean remote) {
}
@Override
public void onError(Exception ex) {
}
}
}
python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnectionV3.java
+1 -59
View File
@@ -1,18 +1,13 @@
package org.jetbrains.plugins.ipnb.protocol;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import org.java_websocket.client.WebSocketClient;
import org.java_websocket.drafts.Draft;
import org.java_websocket.handshake.ServerHandshake;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.ipnb.format.cells.output.IpnbOutputCell;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
public class IpnbConnectionV3 extends IpnbConnection{
@@ -27,60 +22,7 @@ public class IpnbConnectionV3 extends IpnbConnection{
protected void initializeClients() throws URISyntaxException {
final Draft draft = new Draft17WithOrigin();
myChannelsClient = new WebSocketClient(getChannelsURI(), draft) {
private ArrayList<IpnbOutputCell> myOutput = new ArrayList<IpnbOutputCell>();
private Integer myExecCount = null;
@Override
public void onOpen(ServerHandshake handshakeData) {
send(authMessage);
notifyOpen();
}
@Override
public void onMessage(String message) {
final Gson gson = new Gson();
final Message msg = gson.fromJson(message, Message.class);
final Header header = msg.getHeader();
final Header parentHeader = gson.fromJson(msg.getParentHeader(), Header.class);
final String messageType = header.getMessageType();
if ("pyout".equals(messageType) || "display_data".equals(messageType)) {
final PyOutContent content = gson.fromJson(msg.getContent(), PyOutContent.class);
addCellOutput(content, myOutput);
}
else if ("pyerr".equals(messageType) || "error".equals(messageType)) {
final PyErrContent content = gson.fromJson(msg.getContent(), PyErrContent.class);
addCellOutput(content, myOutput);
}
else if ("stream".equals(messageType)) {
final PyStreamContent content = gson.fromJson(msg.getContent(), PyStreamContent.class);
addCellOutput(content, myOutput);
}
else if ("pyin".equals(messageType) || "execute_input".equals(messageType)) {
final JsonElement executionCount = msg.getContent().get("execution_count");
if (executionCount != null) {
myExecCount = executionCount.getAsInt();
}
}
else if ("status".equals(messageType)) {
final PyStatusContent content = gson.fromJson(msg.getContent(), PyStatusContent.class);
if (content.getExecutionState().equals("idle")) {
//noinspection unchecked
myListener.onOutput(IpnbConnectionV3.this, parentHeader.getMessageId(), (List<IpnbOutputCell>)myOutput.clone(), myExecCount);
myOutput.clear();
}
}
}
@Override
public void onClose(int code, String reason, boolean remote) {
}
@Override
public void onError(Exception ex) {
}
};
myChannelsClient = new IpnbWebSocketClient(getChannelsURI(), draft);
myChannelsThread = new Thread(myChannelsClient);
myChannelsThread.start();
}