pinokiod 3.2.214 → 3.2.217

package/kernel/lproxy.js

@@ -42,7 +42,7 @@ class Lproxy {
     // get a new port
     if (!port) {
       port = await portfinder.getPortPromise({
-        port: 42002
+        port: 42003
         //port: 42420
         //port: 50000
         //port: 44000

package/kernel/shell.js

@@ -488,6 +488,10 @@ class Shell {
     //      - if object => the conda.path is the path => create if doesn't exist yet
     // 2. then process venv
 
+    const isNumber = (value) => {
+      return !isNaN(Number(value)) && isFinite(Number(value));
+    }
+
 
     // 1. conda
     let conda_path
@@ -525,7 +529,17 @@ class Shell {
 
             // conda_python
             if (params.conda.python) {
-              conda_python = params.conda.python
+              if (isNumber(params.conda.python)) {
+                conda_python = "python=" + params.conda.python
+              } else {
+                conda_python = params.conda.python
+              }
+            } else if (params.conda_python) {
+              if (isNumber(params.conda_python)) {
+                conda_python = "python=" + params.conda_python
+              } else {
+                conda_python = params.conda_python
+              }
             }
           }
         }
@@ -664,27 +678,92 @@ class Shell {
     }
 
     // 2. venv
+
+    /*
+    {
+      method: ...,
+      params: ...,
+      venv: <path_string>
+    }
+
+    or
+
+    {
+      method: ...,
+      params: ...,
+      venv: {
+        path: <path_string>,
+        python: <python version>
+    }
+
+    or
+
+    {
+      method: ...,
+      params: ...,
+      venv: <path_string>,
+      venv_python: <python version>
+    }
+
+    */
     let venv_activation
     if (params.venv) {
-      let env_path = path.resolve(params.path, params.venv)
-      let activate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "activate") : path.resolve(env_path, "bin", "activate"))
-      let deactivate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "deactivate") : "deactivate")
-      let env_exists = await this.exists(env_path)
-      if (env_exists) {
-        venv_activation = [
-          (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
-          timeout,
-        ]
+      let env_path
+      let python_version = ""
+      let use_uv = false
+      if (typeof params.venv === "string") {
+        env_path = path.resolve(params.path, params.venv)
+        if (params.venv_python) {
+          if (isNumber(params.venv_python)) {
+            python_version = ` --python ${params.venv_python}`
+            use_uv = true
+          }
+        }
+      } else if (typeof params.venv === "object" && params.venv.path) {
+        env_path = path.resolve(params.path, params.venv.path)
+        if (params.venv.python) {
+          if (isNumber(params.venv.python)) {
+            python_version = ` --python ${params.venv.python}`
+            use_uv = true
+          }
+        }
+      }
+      if (env_path) {
+        let activate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "activate") : path.resolve(env_path, "bin", "activate"))
+        let deactivate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "deactivate") : "deactivate")
+        let env_exists = await this.exists(env_path)
+        if (env_exists) {
+          venv_activation = [
+            (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
+            timeout,
+          ]
+        } else {
+          if (use_uv) {
+            // when python version is specified as venv.python => use uv
+            venv_activation = [
+              `uv venv ${env_path}${python_version}`
+              (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
+              `python -m pip install --upgrade pip setuptools wheel`,
+              deactivate_path,
+              timeout,
+              (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
+              timeout,
+            ]
+          } else {
+            // when python version is not specified, use the default python -m venv
+            venv_activation = [
+              `python -m venv ${env_path}`,
+              (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
+              `python -m pip install --upgrade pip setuptools wheel`,
+              deactivate_path,
+              timeout,
+              (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
+              timeout,
+            ]
+          }
+        }
       } else {
-        venv_activation = [
-          `python -m venv ${env_path}`,
-          (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
-          `python -m pip install --upgrade pip setuptools wheel`,
-          deactivate_path,
-          timeout,
-          (this.platform === "win32" ? `${activate_path} ${env_path}` : `source ${activate_path} ${env_path}`),
-          timeout,
-        ]
+        venv_activation = []
       }
     } else {
       venv_activation = []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "3.2.214",
+  "version": "3.2.217",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -551,6 +551,7 @@ class Server {
         install_required = true
       }
 
+
       res.render("download", {
         error,
         current: req.originalUrl,
@@ -2526,7 +2527,7 @@ class Server {
             }
           } else {
             //await this.kernel.api.startProxy("/", `http://127.0.0.1:${this.port}`, "/", { port: 44001 })
-            await this.kernel.api.startProxy("/", `http://127.0.0.1:${this.port}`, "/", { port: 42001 })
+            await this.kernel.api.startProxy("/", `http://127.0.0.1:${this.port}`, "/", { port: 42002 })
           }
           console.log("started proxy")
         } else if (req.body.type === "cloudflare") {

package/server/public/install.js

@@ -12,6 +12,7 @@ const installname = async (url, name) => {
       focusConfirm: false,
   //    showCancelButton: true,
       confirmButtonText: 'Download',
+      allowOutsideClick: false,
       didOpen: () => {
         let input = Swal.getPopup().querySelector('#swal-input1')
         if (name) {
@@ -59,7 +60,6 @@ const install = async (name, url, term, socket, options) => {
     } else {
       cmd = `git clone ${url} ${name}`
     }
-    debugger
     socket.run({
       method: "shell.run",
       params: {