Add Multiple Kernel Support!

zasper-io · Dec 18, 2024 · 11c6ac7 · 11c6ac7
1 parent 37252e0
commit 11c6ac7
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/kernel/kernel_manager.go b/kernel/kernel_manager.go
@@ -92,11 +92,10 @@ func isLocalIP(ip string) bool {
 *********************************************************************/
 
 func (km *KernelManager) asyncLaunchKernel(kernelCmd []string, kw map[string]interface{}) {
-	// km.Provisioner.launchKernel(kernelCmd)
-	log.Info().Msgf("kw : %s", kw)
-	log.Info().Msgf("cmd : %s", kernelCmd)
+	// log.Info().Msgf("kw : %s", kw)
+	// log.Info().Msgf("cmd : %s", kernelCmd)
 
-	ConnectionInfo := km.Provisioner.LaunchKernel(kernelCmd, kw)
+	ConnectionInfo := km.Provisioner.LaunchKernel(kernelCmd, kw, km.ConnectionFile)
 	log.Info().Msgf("connectionInfo: %s", ConnectionInfo)
 }
 
@@ -105,8 +104,8 @@ func (km *KernelManager) preLaunch() map[string]interface{} {
 	if km.ConnectionInfo.Transport == "tcp" && !isLocalIP(km.ConnectionInfo.IP) {
 		log.Info().Msg("Can only launch a kernel on a local interface.")
 	}
-	log.Info().Msgf("cache ports: %t", km.CachePorts)
-	log.Info().Msgf("km.Provisioner.PortsCached %t", km.Provisioner.PortsCached)
+	// log.Info().Msgf("cache ports: %t", km.CachePorts)
+	// log.Info().Msgf("km.Provisioner.PortsCached %t", km.Provisioner.PortsCached)
 
 	if km.CachePorts && !km.Provisioner.PortsCached {
 		km.ConnectionInfo.ShellPort, _ = findAvailablePort()
@@ -116,7 +115,10 @@ func (km *KernelManager) preLaunch() map[string]interface{} {
 		km.ConnectionInfo.ControlPort, _ = findAvailablePort()
 		log.Info().Msgf("connectionInfo : %+v", km.ConnectionInfo)
 	}
-	km.writeConnectionFile("kernelConnection.json")
+	log.Info().Msgf("km.ConnectionFile : %+v", km.ConnectionFile)
+
+	km.writeConnectionFile(km.ConnectionFile)
+	// km.writeConnectionFile("kernelConnection.json")
 
 	kernelCmd := km.formatKernelCmd()
 	log.Info().Msgf("kernel cmd is %s", kernelCmd)

diff --git a/kernel/kernel_supervisor.go b/kernel/kernel_supervisor.go
@@ -118,7 +118,7 @@ func CwdForPath(path string) string {
 }
 
 func createKernelManager(kernelName string, kernelId string) (KernelManager, string, string) {
-	connectionDir := ""
+	connectionDir := "/tmp/"
 	kernelName = "python3" // note this is default kernel Name
 	connectionFile := filepath.Join(connectionDir, "kernel-"+kernelId[:6]+".json")
 	km := KernelManager{

diff --git a/kernel/launcher/launcher.go b/kernel/launcher/launcher.go
@@ -8,9 +8,9 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-func LaunchKernel(kernelCmd []string, kw map[string]interface{}) *os.Process {
+func LaunchKernel(kernelCmd []string, kw map[string]interface{}, connFile string) *os.Process {
 
-	cmd := exec.Command("/usr/bin/python3", "-m", "ipykernel_launcher", "-f", "kernelConnection.json") //  "--debug"
+	cmd := exec.Command("/usr/bin/python3", "-m", "ipykernel_launcher", "-f", connFile) //  "--debug"
 
 	// Create pipes for standard input, output, and error
 	stdin, err := cmd.StdinPipe()

diff --git a/kernel/provisioner/local_provisioner.go b/kernel/provisioner/local_provisioner.go
@@ -21,8 +21,8 @@ type LocalProvisioner struct {
 	PortsCached    bool
 }
 
-func (provisioner *LocalProvisioner) LaunchKernel(kernelCmd []string, kw map[string]interface{}) KernelConnectionInfo {
-	process := launcher.LaunchKernel(kernelCmd, kw)
+func (provisioner *LocalProvisioner) LaunchKernel(kernelCmd []string, kw map[string]interface{}, connFile string) KernelConnectionInfo {
+	process := launcher.LaunchKernel(kernelCmd, kw, connFile)
 	provisioner.Pid = process.Pid
 	log.Info().Msgf("kernel launched with pid: %d", process.Pid)
 	return provisioner.ConnectionInfo

diff --git a/kernel/utils.go b/kernel/utils.go
@@ -58,7 +58,7 @@ func findAvailablePort() (int, error) {
 		if portExists(port) {
 			continue
 		}
-		log.Info().Msgf("check port %d", port)
+		// log.Info().Msgf("check port %d", port)
 		l, err := net.Listen("tcp", ":"+strconv.Itoa(port))
 		if err == nil {
 			currentlyUsedPorts = append(currentlyUsedPorts, port)

diff --git a/ui/src/ide/editor/notebook/NotebookEditor.tsx b/ui/src/ide/editor/notebook/NotebookEditor.tsx
@@ -98,7 +98,7 @@ export default function NotebookEditor(props) {
   useEffect(() => {
     if (props.data.load_required === true) {
       FetchFileData(props.data.path);
-      // const session = startASession(props.data.path, props.data.name, props.data.type);
+      const session = startASession(props.data.path, props.data.name, props.data.type);
     }
   }, [props.data]);