mirror of
https://github.com/WolframResearch/WolframLanguageForJupyter.git
synced 2025-04-18 20:56:05 +00:00
Delete old install.wls, update changes from install.wls into configure-jupyter.wls, and update KernelForWolframLanguageForJupyter.wl
This commit is contained in:
ccooley
parent
d761e2ac6d
commit
32ede3367e
@ -68,6 +68,7 @@ Print[args___, opts:OptionsPattern[]] :=
|
||||
Import[$Output[[1,1]], "String"]
|
||||
];
|
||||
];
|
||||
Close[First[$Output]];
|
||||
Null
|
||||
] /; !TrueQ[$inPrint];
|
||||
|
||||
@ -167,7 +168,7 @@ getFrameAssoc[frame_Association, replyType_String, replyContent_String, branchOf
|
||||
header = frame["header"];
|
||||
content = frame["content"];
|
||||
|
||||
AssociateTo[res, {"header" -> Association[ImportString[header, "JSON"]], "content" -> Association[ImportString[content, "JSON"]]}];
|
||||
AssociateTo[res, {"header" -> Association[ImportByteArray[StringToByteArray[header], "JSON"]], "content" -> Association[ImportByteArray[StringToByteArray[content], "JSON"]]}];
|
||||
AssociateTo[
|
||||
res,
|
||||
"replyMsg" ->
|
||||
@ -305,7 +306,7 @@ jupyterEvaluationLoop[] :=
|
||||
frameAssoc["header"]["msg_type"],
|
||||
"kernel_info_request",
|
||||
replyMsgType = "kernel_info_reply";
|
||||
replyContent = "{\"protocol_version\":\"5.3.0\",\"implementation\":\"WL\"}";,
|
||||
replyContent = "{\"protocol_version\": \"5.3.0\",\"implementation\": \"WolframLanguageForJupyter\",\"implementation_version\": \"0.0.1\",\"language_info\": {\"name\": \"Wolfram Language\",\"version\": \"12.0\",\"mimetype\": \"application/vnd.wolfram.m\",\"file_extension\": \".m\",\"pygments_lexer\": \"python\",\"codemirror_mode\": \"python\"},\"banner\" : \"Mathematica Copyright 2018\"}";,
|
||||
"is_complete_request",
|
||||
(* Add syntax-Q checking *)
|
||||
replyMsgType = "is_complete_reply";
|
||||
|
||||
@ -68,7 +68,7 @@ getNames[mathB_String, wasProvided_?BooleanQ] :=
|
||||
];
|
||||
|
||||
projectHome = Directory[];
|
||||
kernelScript = FileNameJoin[{projectHome, "WolframLanguageForJupyter", "Resources", "kernel.wl"}];
|
||||
kernelScript = FileNameJoin[{projectHome, "WolframLanguageForJupyter", "Resources", "KernelForWolframLanguageForJupyter.wl"}];
|
||||
If[
|
||||
!(FileType[kernelScript] === File),
|
||||
Print[nopaclet];
|
||||
|
||||
289
install.wls
289
install.wls
@ -1,289 +0,0 @@
|
||||
Begin["WolframLanguageForJupyter`Private`"];
|
||||
|
||||
notfound = "install.wls: Jupyter installation on Environment[\"PATH\"] not found.";
|
||||
isdir = "install.wls: Provided Jupyter binary path is a directory. Please provide the path to the Jupyter binary."
|
||||
nobin = "install.wls: Provided Jupyter binary path does not exist.";
|
||||
isdirMath = "install.wls: Provided Wolfram Language kernel binary path is a directory. Please provide the path to the Wolfram Language kernel binary."
|
||||
nobinMath = "install.wls: Provided Wolfram Language kernel binary path does not exist.";
|
||||
notadded = "install.wls: An error has occurred. There is still no Wolfram Language kernel in \"jupyter kernelspec list.\"";
|
||||
notremoved = "install.wls: An error has occurred. There is a Wolfram Language kernel still in \"jupyter kernelspec list.\"";
|
||||
nopaclet = "install.wls: WolframLanguageForJupyter paclet source not detected. Are you running the script in the root project directory?";
|
||||
|
||||
|
||||
hashedKernelUUID = Hash[$InstallationDirectory, "SHA", "HexString"];
|
||||
names = StringCases[$Version, name___ ~~ " for " ~~ ("Mac" | "Microsoft" | "Windows" | "Linux") -> name];
|
||||
If[Length[names] > 0,
|
||||
globalKernelUUID =
|
||||
ToLowerCase[StringJoin[
|
||||
"WolframLanguage-",
|
||||
StringReplace[First[names], Whitespace -> "-"]
|
||||
]];
|
||||
displayName =
|
||||
StringJoin[
|
||||
"Wolfram Language (",
|
||||
Capitalize[
|
||||
First[names],
|
||||
"AllWords"
|
||||
],
|
||||
")"
|
||||
];
|
||||
,
|
||||
globalKernelUUID = hashedKernelUUID;
|
||||
displayName = "Wolfram Language";
|
||||
];
|
||||
|
||||
projectHome = Directory[];
|
||||
kernelScript = FileNameJoin[{projectHome, "WolframLanguageForJupyter", "Resources", "KernelForWolframLanguageForJupyter.wl"}];
|
||||
If[
|
||||
!FileExistsQ[kernelScript],
|
||||
Print[nopaclet];
|
||||
Quit[];
|
||||
];
|
||||
|
||||
|
||||
mathBin := (defineGlobalVars; mathBin);
|
||||
fileExt := (defineGlobalVars; fileExt);
|
||||
pathSeperator := (defineGlobalVars; pathSeperator);
|
||||
|
||||
defineGlobalVars :=
|
||||
Switch[
|
||||
$OperatingSystem,
|
||||
"Windows",
|
||||
mathBin = FileNameJoin[{$InstallationDirectory, "wolfram.exe"}];
|
||||
fileExt = ".exe";
|
||||
pathSeperator = ";";,
|
||||
"MacOSX",
|
||||
mathBin = FileNameJoin[{$InstallationDirectory, "MacOS", "WolframKernel"}];
|
||||
fileExt = "";
|
||||
pathSeperator = ":";,
|
||||
"Unix",
|
||||
mathBin = FileNameJoin[{$InstallationDirectory, "MacOS", "Kernel", "Binaries", $SystemID, "WolframKernel"}];
|
||||
fileExt = "";
|
||||
pathSeperator = ":";
|
||||
];
|
||||
|
||||
splitPath := StringSplit[Environment["PATH"], pathSeperator];
|
||||
|
||||
attemptPathRegeneration[] := If[
|
||||
$OperatingSystem === "MacOSX" && FileExistsQ["~/.profile"] && !DirectoryQ["~/.profile"],
|
||||
Print["install.wls: Warning: Regenerating PATH ..."];
|
||||
SetEnvironment[
|
||||
"PATH" -> StringTrim[
|
||||
RunProcess[
|
||||
$SystemShell,
|
||||
"StandardOutput",
|
||||
StringJoin[Import["~/.profile", "String"], "\necho $PATH"],
|
||||
ProcessEnvironment -> {}
|
||||
],
|
||||
"\n"
|
||||
]
|
||||
];
|
||||
];
|
||||
|
||||
If[
|
||||
FailureQ[RunProcess[$SystemShell, All, ""]],
|
||||
If[
|
||||
MemberQ[$CommandLine, "-script"],
|
||||
Print["install.wls: Please use -file instead of -script in WolframScript."];,
|
||||
Print["install.wls: An unknown error has occurred."];
|
||||
attemptPathRegeneration[];
|
||||
];
|
||||
Quit[];
|
||||
];
|
||||
|
||||
defineGlobalVars;
|
||||
If[
|
||||
Length[splitPath] == 1,
|
||||
Print["install.wls: Warning: This script has encountered a very small PATH environment variable."];
|
||||
Print["install.wls: Warning: This can occur due to a possible WolframScript bug."];
|
||||
attemptPathRegeneration[];
|
||||
];
|
||||
|
||||
|
||||
findJupyerPath[] :=
|
||||
SelectFirst[
|
||||
splitPath,
|
||||
FileExistsQ[FileNameJoin[{#1, StringJoin["jupyter", fileExt]}]]&
|
||||
];
|
||||
|
||||
addKernelToJupyter[] :=
|
||||
Module[{jupyterPath},
|
||||
jupyterPath = findJupyerPath[];
|
||||
If[MissingQ[jupyterPath],
|
||||
Print[notfound];
|
||||
Return[$Failed];
|
||||
];
|
||||
Return[addKernelToJupyter[FileNameJoin[{jupyterPath, StringJoin["jupyter", fileExt]}]]];
|
||||
];
|
||||
|
||||
removeKernelFromJupyter[] :=
|
||||
Module[{jupyterPath},
|
||||
jupyterPath = findJupyerPath[];
|
||||
If[MissingQ[jupyterPath],
|
||||
Print[notfound];
|
||||
Return[$Failed];
|
||||
];
|
||||
Return[removeKernelFromJupyter[FileNameJoin[{jupyterPath, StringJoin["jupyter", fileExt]}]]];
|
||||
];
|
||||
|
||||
getKernelspecAssoc[jupyterPath_String] :=
|
||||
Module[{json},
|
||||
json = Quiet[ImportString[RunProcess[{jupyterPath, "kernelspec", "list", "--json"}, "StandardOutput"], "JSON"]];
|
||||
If[
|
||||
FailureQ[json],
|
||||
Return[Association[]];
|
||||
];
|
||||
Return[
|
||||
Replace[
|
||||
json,
|
||||
part_List /; AllTrue[part, Head[#1] === Rule &] -> Association @ part,
|
||||
{0, Infinity}
|
||||
]
|
||||
];
|
||||
];
|
||||
|
||||
addKernelToJupyter[jupyterPath_String] := addKernelToJupyter[jupyterPath, mathBin];
|
||||
|
||||
removeKernelFromJupyter[jupyterPath_Strings] :=
|
||||
Module[{exitCodeOld, exitCode, kernelspecAssoc, kernelspecs, oldEnv},
|
||||
If[DirectoryQ[jupyterPath],
|
||||
Print[isdir];
|
||||
Return[$Failed];
|
||||
];
|
||||
If[!FileExistsQ[jupyterPath],
|
||||
Print[nobin];
|
||||
Return[$Failed];
|
||||
];
|
||||
|
||||
oldEnv = Environment["PATH"];
|
||||
SetEnvironment["PATH" -> StringJoin[Environment["PATH"], pathSeperator, DirectoryName[jupyterPath]]];
|
||||
|
||||
exitCodeOld = RunProcess[{jupyterPath, "kernelspec", "remove", "-f", hashedKernelUUID}, "ExitCode"];
|
||||
exitCode = RunProcess[{jupyterPath, "kernelspec", "remove", "-f", globalKernelUUID}, "ExitCode"];
|
||||
|
||||
kernelspecAssoc = getKernelspecAssoc[jupyterPath];
|
||||
If[
|
||||
KeyExistsQ[kernelspecAssoc, "kernelspecs"],
|
||||
kernelspecs = Keys[kernelspecAssoc["kernelspecs"]];,
|
||||
kernelspecs = {};
|
||||
];
|
||||
|
||||
If[MemberQ[
|
||||
kernelspecs,
|
||||
|
||||
globalKernelUUID
|
||||
],
|
||||
Print[notremoved];
|
||||
Return[$Failed];
|
||||
];
|
||||
|
||||
SetEnvironment["PATH" -> oldEnv];
|
||||
|
||||
|
||||
];
|
||||
|
||||
addKernelToJupyter[jupyterPath_String, mathB_String] :=
|
||||
Module[{baseDir, tempDir, exitCode, kernelspecAssoc, kernelspecs, kernelUUID, oldEnv},
|
||||
If[DirectoryQ[jupyterPath],
|
||||
Print[isdir];
|
||||
Return[$Failed];
|
||||
];
|
||||
If[!FileExistsQ[jupyterPath],
|
||||
Print[nobin];
|
||||
Return[$Failed];
|
||||
];
|
||||
|
||||
If[DirectoryQ[mathB],
|
||||
Print[isdirMath];
|
||||
Return[$Failed];
|
||||
];
|
||||
If[!FileExistsQ[mathB],
|
||||
Print[nobinMath];
|
||||
Return[$Failed];
|
||||
];
|
||||
|
||||
oldEnv = Environment["PATH"];
|
||||
SetEnvironment["PATH" -> StringJoin[Environment["PATH"], pathSeperator, DirectoryName[jupyterPath]]];
|
||||
|
||||
kernelUUID = CreateUUID[];
|
||||
tempDir = CreateDirectory[
|
||||
FileNameJoin[{
|
||||
projectHome,
|
||||
kernelUUID,
|
||||
|
||||
globalKernelUUID
|
||||
}], CreateIntermediateDirectories -> True
|
||||
];
|
||||
Export[
|
||||
FileNameJoin[{tempDir, "kernel.json"}],
|
||||
Association[
|
||||
"argv" -> {mathB, "-script", kernelScript, "{connection_file}"},
|
||||
"display_name" -> displayName,
|
||||
"language" -> "Wolfram Language"
|
||||
]
|
||||
];
|
||||
exitCode = RunProcess[{
|
||||
jupyterPath,
|
||||
"kernelspec",
|
||||
"install",
|
||||
tempDir
|
||||
}, "ExitCode"];
|
||||
|
||||
|
||||
DeleteDirectory[DirectoryName[tempDir], DeleteContents -> True];
|
||||
|
||||
kernelspecAssoc = getKernelspecAssoc[jupyterPath];
|
||||
If[
|
||||
KeyExistsQ[kernelspecAssoc, "kernelspecs"],
|
||||
kernelspecs = Keys[kernelspecAssoc["kernelspecs"]];,
|
||||
kernelspecs = {};
|
||||
];
|
||||
|
||||
If[!MemberQ[
|
||||
kernelspecs,
|
||||
|
||||
globalKernelUUID
|
||||
],
|
||||
Print[notadded];
|
||||
Return[$Failed];
|
||||
];
|
||||
|
||||
SetEnvironment["PATH" -> oldEnv];
|
||||
|
||||
|
||||
];
|
||||
|
||||
templateJupyterPath = FileNameJoin[{"path", "to", "Jupyter", "binary"}];
|
||||
templateWLPath = FileNameJoin[{"", "absolute", "path", "to", "Wolfram", "Language", "kernel", "binary"}];
|
||||
|
||||
helpMessage = StringJoin[
|
||||
"install.wls: Usage: install.wls add [", templateJupyterPath, "]\ninstall.wls: Usage:\tadds a Wolfram Language kernel to a Jupyter binary on PATH, or optional provided Jupyter binary path\n",
|
||||
"install.wls: Usage: install.wls add ", templateJupyterPath, " ", templateWLPath, "\ninstall.wls: Usage:\tadds the provided absolute Wolfram Language kernel binary path to the provided Jupyter binary path\n",
|
||||
"install.wls: Usage: install.wls remove [", templateJupyterPath ,"]\ninstall.wls: Usage:\tremoves any Wolfram Language kernels found on a Jupyter binary on PATH, or optional provided Jupyter binary path"
|
||||
];
|
||||
|
||||
If[Length[$ScriptCommandLine] == 1 || $ScriptCommandLine[[2]] === "help",
|
||||
Print[helpMessage];
|
||||
,
|
||||
If[$ScriptCommandLine[[2]] === "remove",
|
||||
command = removeKernelFromJupyter;,
|
||||
command = addKernelToJupyter;
|
||||
];
|
||||
|
||||
Switch[
|
||||
Length[$ScriptCommandLine],
|
||||
4,
|
||||
command[
|
||||
StringTrim[$ScriptCommandLine[[3]], "*"],
|
||||
StringTrim[$ScriptCommandLine[[4]], "*"]
|
||||
];,
|
||||
3,
|
||||
command[
|
||||
StringTrim[$ScriptCommandLine[[3]], "*"]
|
||||
];,
|
||||
_,
|
||||
command[];
|
||||
];
|
||||
];
|
||||
|
||||
End[];
|
||||
Loading…
x
Reference in New Issue
Block a user