mirrors/WolframLanguageForJupyter
1
0
Fork 0
mirror of https://github.com/WolframResearch/WolframLanguageForJupyter.git synced 2025-04-16 11:46:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #73 from WolframResearch/bugfix/jupyter-console-problems

Browse Source 
Fix some small problems with WolframLanguageForJupyter's jupyter-console mode
This commit is contained in:
cc-wr 2020-02-04 17:51:51 -05:00 committed by GitHub
commit 03d50854c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
WolframLanguageForJupyter/Resources/MessagingUtilities.wl
View File

@ -108,7 +108,7 @@ If[
(* the message type to be used for the reply message frame *)
replyType_String,
(* the content to be used for the reply message frame *)
replyContent_String,
replyContent : (_String | _ByteArray),
(* whether to list sourceFrame as a parent for the reply message frame *)
branchOff:(True|False)
] :=
@ -157,7 +157,7 @@ If[
result["header"],
result["pheader"],
result["metadata"],
result["content"]
If[StringQ[result["content"]], result["content"], ByteArrayToString[result["content"]]]
]
]
];

94
WolframLanguageForJupyter/Resources/RequestHandlers.wl
View File

@ -283,7 +283,7 @@ If[
toOut = toOutImageHTML
];
(* prepare the content for a reply message frame to be sent on the IO Publish socket *)
ioPubReplyContent = ExportString[
ioPubReplyContent = ExportByteArray[
Association[
(* the first output index *)
"execution_count" -> First[totalResult["EvaluationResultOutputLineIndices"]],
@ -292,52 +292,58 @@ If[
{
(* generate HTML for the results and messages *)
"text/html" ->
(* output the results in a grid *)
If[
Length[totalResult["EvaluationResult"]] > 1,
StringJoin[
(* add grid style *)
"<style>
.grid-container {
display: inline-grid;
grid-template-columns: auto;
}
</style>
loopState["isCompleteRequestSent"],
(* if an is_complete_request has been sent, assume jupyter-console is running the kernel,
and do not generate HTML *)
"",
(* otherwise, output the results in a grid *)
If[
Length[totalResult["EvaluationResult"]] > 1,
StringJoin[
(* add grid style *)
"<style>
.grid-container {
display: inline-grid;
grid-template-columns: auto;
}
</style>
<div>",
(* display error message *)
errorMessage,
(* start the grid *)
"<div class=\"grid-container\">",
(* display the output lines *)
Table[
{
(* start the grid item *)
"<div class=\"grid-item\">",
(* show the output line *)
toOut[totalResult["EvaluationResult"][[outIndex]]],
(* end the grid item *)
"</div>"
},
{outIndex, 1, Length[totalResult["EvaluationResult"]]}
<div>",
(* display error message *)
errorMessage,
(* start the grid *)
"<div class=\"grid-container\">",
(* display the output lines *)
Table[
{
(* start the grid item *)
"<div class=\"grid-item\">",
(* show the output line *)
toOut[totalResult["EvaluationResult"][[outIndex]]],
(* end the grid item *)
"</div>"
},
{outIndex, 1, Length[totalResult["EvaluationResult"]]}
],
(* end the element *)
"</div></div>"
],
(* end the element *)
"</div></div>"
],
StringJoin[
(* start the element *)
"<div>",
(* display error message *)
errorMessage,
(* if there are messages, but no results, do not display a result *)
If[
Length[totalResult["EvaluationResult"]] == 0,
"",
(* otherwise, display a result *)
toOut[First[totalResult["EvaluationResult"]]]
],
(* end the element *)
"</div>"
StringJoin[
(* start the element *)
"<div>",
(* display error message *)
errorMessage,
(* if there are messages, but no results, do not display a result *)
If[
Length[totalResult["EvaluationResult"]] == 0,
"",
(* otherwise, display a result *)
toOut[First[totalResult["EvaluationResult"]]]
],
(* end the element *)
"</div>"
]
]
],
(* provide, as a backup, plain text for the results *)

2
WolframLanguageForJupyter/Resources/SocketUtilities.wl
View File

@ -74,7 +74,7 @@ If[
socketWriteFunction[
socket,
StringToByteArray[frame["content"]],
If[ByteArrayQ[frame["content"]], frame["content"], StringToByteArray[frame["content"]]],
"Multipart" -> False
];
];