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

fixed PY-15404 ipython notebook %load does not work

Browse Source
This commit is contained in:
Ekaterina Tuzova
2015-04-27 16:33:50 +03:00
parent 79f83b0954
commit 057e07f720
6 changed files with 108 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/ipnb/src/org/jetbrains/plugins/ipnb/configuration/IpnbConnectionManager.java
+18 -6
View File
@@ -6,6 +6,7 @@ import com.intellij.execution.ExecutionException;
import com.intellij.execution.RunContentExecutor;
import com.intellij.execution.configurations.GeneralCommandLine;
import com.intellij.execution.process.KillableColoredProcessHandler;
import com.intellij.execution.process.UnixProcessManager;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.components.ProjectComponent;
import com.intellij.openapi.diagnostic.Logger;
@@ -157,13 +158,22 @@ public final class IpnbConnectionManager implements ProjectComponent {
@Override
public void onOutput(@NotNull IpnbConnection connection,
@NotNull String parentMessageId,
@NotNull List<IpnbOutputCell> outputs,
@Nullable Integer execCount) {
@NotNull String parentMessageId) {
if (!myUpdateMap.containsKey(parentMessageId)) return;
final IpnbCodePanel cell = myUpdateMap.get(parentMessageId);
cell.getCell().setPromptNumber(connection.getExecCount());
//noinspection unchecked
cell.updatePanel(null, (List<IpnbOutputCell>)connection.getOutput().clone());
}
@Override
public void onPayload(@Nullable String payload, @NotNull String parentMessageId) {
if (!myUpdateMap.containsKey(parentMessageId)) return;
final IpnbCodePanel cell = myUpdateMap.remove(parentMessageId);
cell.getCell().setPromptNumber(execCount);
cell.updatePanel(outputs);
if (payload != null) {
//noinspection unchecked
cell.updatePanel(payload, null);
}
}
};
@@ -296,6 +306,7 @@ public final class IpnbConnectionManager implements ProjectComponent {
private void shutdownKernels() {
for (IpnbConnection connection : myKernels.values()) {
if (!connection.isAlive()) continue;
connection.shutdown();
try {
connection.close();
@@ -309,7 +320,8 @@ public final class IpnbConnectionManager implements ProjectComponent {
}
myKernels.clear();
if (myProcessHandler != null && !myProcessHandler.isProcessTerminated()) {
myProcessHandler.killProcess();
myProcessHandler.destroyProcess();
UnixProcessManager.sendSigIntToProcessTree(myProcessHandler.getProcess());
}
}
python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbCodePanel.java
+19 -6
View File
@@ -1,6 +1,7 @@
package org.jetbrains.plugins.ipnb.editor.panels.code;
import com.google.common.collect.Lists;
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.Document;
import com.intellij.openapi.editor.Editor;
@@ -9,6 +10,7 @@ import com.intellij.openapi.ui.VerticalFlowLayout;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ui.UIUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.ipnb.configuration.IpnbConnectionManager;
import org.jetbrains.plugins.ipnb.editor.IpnbEditorUtil;
import org.jetbrains.plugins.ipnb.editor.IpnbFileEditor;
@@ -117,7 +119,6 @@ public class IpnbCodePanel extends IpnbEditablePanel<JComponent, IpnbCodeCell> {
super.runCell();
updateCellSource();
myCell.setPromptNumber(-1);
updatePanel(myCell.getCellOutputs());
final IpnbConnectionManager connectionManager = IpnbConnectionManager.getInstance(myProject);
connectionManager.executeCell(this);
setEditing(false);
@@ -135,10 +136,20 @@ public class IpnbCodePanel extends IpnbEditablePanel<JComponent, IpnbCodeCell> {
myCell.setSource(StringUtil.splitByLinesKeepSeparators(text));
}
public void updatePanel(@NotNull final List<IpnbOutputCell> outputContent) {
ApplicationManager.getApplication().invokeLater(new Runnable() {
public void updatePanel(@Nullable final String replacementContent, @Nullable final List<IpnbOutputCell> outputContent) {
final Application application = ApplicationManager.getApplication();
application.invokeLater(new Runnable() {
@Override
public void run() {
if (replacementContent != null) {
myCell.setSource(StringUtil.splitByLinesKeepSeparators(replacementContent));
application.runWriteAction(new Runnable() {
@Override
public void run() {
myCodeSourcePanel.getEditor().getDocument().setText(replacementContent);
}
});
}
myCell.removeCellOutputs();
myViewPanel.removeAll();
@@ -147,9 +158,11 @@ public class IpnbCodePanel extends IpnbEditablePanel<JComponent, IpnbCodeCell> {
addPromptPanel(panel, myCell.getPromptNumber(), IpnbEditorUtil.PromptType.In, myCodeSourcePanel);
myViewPanel.add(panel);
for (IpnbOutputCell output : outputContent) {
myCell.addCellOutput(output);
addOutputPanel(myViewPanel, output, true);
if (outputContent != null) {
for (IpnbOutputCell output : outputContent) {
myCell.addCellOutput(output);
addOutputPanel(myViewPanel, output, true);
}
}
final IpnbFilePanel filePanel = myParent.getIpnbFilePanel();
python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnection.java
+57 -7
View File
@@ -43,6 +43,10 @@ public class IpnbConnection {
private volatile boolean myIsIOPubOpen = false;
protected volatile boolean myIsOpened = false;
private ArrayList<IpnbOutputCell> myOutput = new ArrayList<IpnbOutputCell>();
private int myExecCount;
public IpnbConnection(@NotNull String uri, @NotNull IpnbConnectionListener listener) throws IOException, URISyntaxException {
myURI = new URI(uri);
myListener = listener;
@@ -310,6 +314,33 @@ public class IpnbConnection {
private interface PyContent {}
@SuppressWarnings("UnusedDeclaration")
protected static class Payload {
String text;
boolean replace;
String source;
}
@SuppressWarnings("UnusedDeclaration")
protected static class PyExecuteReplyContent implements PyContent {
private int execution_count;
private JsonObject metadata;
private String status;
private List<Payload> payload;
public int getExecutionCount() {
return execution_count;
}
public JsonObject getMetadata() {
return metadata;
}
public List<Payload> getPayload() {
return payload;
}
}
@SuppressWarnings("UnusedDeclaration")
protected static class PyOutContent implements PyContent {
private int execution_count;
@@ -388,10 +419,7 @@ public class IpnbConnection {
}
protected class IpnbWebSocketClient extends WebSocketClient {
private ArrayList<IpnbOutputCell> myOutput = new ArrayList<IpnbOutputCell>();
private Integer myExecCount = null;
IpnbWebSocketClient(URI serverUri, Draft draft) {
protected IpnbWebSocketClient(@NotNull final URI serverUri, @NotNull final Draft draft) {
super(serverUri, draft);
}
@@ -413,6 +441,19 @@ public class IpnbConnection {
final PyOutContent content = gson.fromJson(msg.getContent(), PyOutContent.class);
addCellOutput(content, myOutput);
}
if ("execute_reply".equals(messageType)) {
final PyExecuteReplyContent content = gson.fromJson(msg.getContent(), PyExecuteReplyContent.class);
final List<Payload> payloads = content.payload;
if (payloads != null && !payloads.isEmpty()) {
final Payload payload = payloads.get(0);
if (payload.replace) {
myListener.onPayload(payload.text, parentHeader.getMessageId());
}
}
else {
myListener.onPayload(null, parentHeader.getMessageId());
}
}
else if ("pyerr".equals(messageType) || "error".equals(messageType)) {
final PyErrContent content = gson.fromJson(msg.getContent(), PyErrContent.class);
addCellOutput(content, myOutput);
@@ -429,9 +470,9 @@ public class IpnbConnection {
}
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);
final String executionState = content.getExecutionState();
if ("idle".equals(executionState)) {
myListener.onOutput(IpnbConnection.this, parentHeader.getMessageId());
myOutput.clear();
}
}
@@ -447,4 +488,13 @@ public class IpnbConnection {
}
}
public ArrayList<IpnbOutputCell> getOutput() {
return myOutput;
}
public int getExecCount() {
return myExecCount;
}
}
python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnectionListener.java
+4 -6
View File
@@ -2,9 +2,6 @@ package org.jetbrains.plugins.ipnb.protocol;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.ipnb.format.cells.output.IpnbOutputCell;
import java.util.List;
/**
* TODO: Expose execution counter via API
@@ -14,7 +11,8 @@ import java.util.List;
public interface IpnbConnectionListener {
void onOpen(@NotNull IpnbConnection connection);
void onOutput(@NotNull IpnbConnection connection,
@NotNull String parentMessageId,
@NotNull List<IpnbOutputCell> outputs,
@Nullable Integer execCount);
@NotNull String parentMessageId);
void onPayload(@Nullable final String payload,
@NotNull String parentMessageId);
}
python/ipnb/src/org/jetbrains/plugins/ipnb/protocol/IpnbConnectionListenerBase.java
+5 -6
View File
@@ -2,9 +2,6 @@ package org.jetbrains.plugins.ipnb.protocol;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.ipnb.format.cells.output.IpnbOutputCell;
import java.util.List;
/**
* @author vlan
@@ -16,8 +13,10 @@ public class IpnbConnectionListenerBase implements IpnbConnectionListener {
@Override
public void onOutput(@NotNull IpnbConnection connection,
@NotNull String parentMessageId,
@NotNull List<IpnbOutputCell> outputs,
@Nullable Integer execCount) {
@NotNull String parentMessageId) {
}
public void onPayload(@Nullable final String payload,
@NotNull String parentMessageId) {
}
}
python/ipnb/testSrc/WebSocketConnectionTest.java
+5 -7
View File
@@ -8,7 +8,7 @@ import org.jetbrains.plugins.ipnb.protocol.IpnbConnectionListenerBase;
import java.io.IOException;
import java.net.URISyntaxException;
import java.util.List;
import java.util.ArrayList;
/**
*
@@ -49,10 +49,9 @@ public class WebSocketConnectionTest extends TestCase {
@Override
public void onOutput(@NotNull IpnbConnection connection,
@NotNull String parentMessageId,
@NotNull List<IpnbOutputCell> outputs,
Integer execCount) {
@NotNull String parentMessageId) {
if (myMessageId.equals(parentMessageId)) {
final ArrayList<IpnbOutputCell> outputs = connection.getOutput();
assertEquals(outputs.size(), 1);
assertEquals(outputs.get(0).getClass(), IpnbOutOutputCell.class);
final String[] text = outputs.get(0).getText();
@@ -85,10 +84,9 @@ public class WebSocketConnectionTest extends TestCase {
@Override
public void onOutput(@NotNull IpnbConnection connection,
@NotNull String parentMessageId,
@NotNull List<IpnbOutputCell> outputs,
Integer execCount) {
@NotNull String parentMessageId) {
if (myMessageId.equals(parentMessageId)) {
final ArrayList<IpnbOutputCell> outputs = connection.getOutput();
assertEquals(outputs.size(), 1);
assertEquals(outputs.get(0).getClass(), IpnbOutOutputCell.class);
final String[] text = outputs.get(0).getText();