pinokiod 1.1.8 → 1.1.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/kernel/bin/conda.js +2 -2
- package/kernel/shell.js +6 -0
- package/kernel/template.js +2 -3
- package/package.json +1 -1
package/kernel/bin/conda.js
CHANGED
|
@@ -74,8 +74,8 @@ class Conda {
|
|
|
74
74
|
(this.kernel.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
|
|
75
75
|
(this.platform === 'win32' ? `activate base` : `conda activate base`),
|
|
76
76
|
"conda config --add create_default_packages python=3.10",
|
|
77
|
-
"conda install -y pip brotli brotlipy",
|
|
78
|
-
"conda update -y --all",
|
|
77
|
+
"conda install -y -c conda-forge pip brotli brotlipy",
|
|
78
|
+
// "conda update -y --all",
|
|
79
79
|
]
|
|
80
80
|
}, (stream) => {
|
|
81
81
|
ondata(stream)
|
package/kernel/shell.js
CHANGED
|
@@ -512,6 +512,12 @@ class Shell {
|
|
|
512
512
|
}
|
|
513
513
|
}
|
|
514
514
|
}
|
|
515
|
+
if (params.env) {
|
|
516
|
+
params.env.CONDA_PIP_INTEROP_ENABLED = "1"
|
|
517
|
+
params.env.CONDA_AUTO_ACTIVATE_BASE = "false"
|
|
518
|
+
} else {
|
|
519
|
+
params.env = { CONDA_PIP_INTEROP_ENABLED: "1", CONDA_AUTO_ACTIVATE_BASE: "false" }
|
|
520
|
+
}
|
|
515
521
|
} else if (params.venv) {
|
|
516
522
|
let env_path = path.resolve(params.path, params.venv)
|
|
517
523
|
let activate_path = (this.platform === 'win32' ? path.resolve(env_path, "Scripts", "activate") : path.resolve(env_path, "bin", "activate"))
|
package/kernel/template.js
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
const system = require('systeminformation');
|
|
2
2
|
const path = require("path")
|
|
3
|
-
const si = require('systeminformation')
|
|
4
3
|
const fs = require("fs")
|
|
5
4
|
const _ = require("lodash")
|
|
6
5
|
class Template {
|
|
@@ -11,7 +10,7 @@ class Template {
|
|
|
11
10
|
this.os = kernel.os
|
|
12
11
|
}
|
|
13
12
|
async init() {
|
|
14
|
-
let g = await
|
|
13
|
+
let g = await system.graphics()
|
|
15
14
|
let gpus
|
|
16
15
|
if (g && g.controllers && g.controllers.length > 0) {
|
|
17
16
|
gpus = g.controllers.map((x) => { return x.vendor.toLowerCase() })
|
|
@@ -216,7 +215,7 @@ class Template {
|
|
|
216
215
|
let fun = new Function("uri", "cwd", "key", "local", "global", "self", "input", "current", "next", "event", "_", "os", "path", "system", "pip", "platform", "arch", "gpu", "gpus", "kernel", `return ${o}`)
|
|
217
216
|
try {
|
|
218
217
|
console.log("fun", fun.toString())
|
|
219
|
-
let response = fun(vars.uri, vars.cwd, vars.key, vars.local, vars.global, vars.self, vars.input, vars.current, vars.next, vars.event, _, os, path, system, vars.pip, this.platform, this.arch, this.gpu, this.gpus, this.kernel)
|
|
218
|
+
let response = fun(vars.uri, vars.cwd, vars.key, vars.local, vars.global, vars.self, vars.input, vars.current, vars.next, vars.event, _, this.os, path, system, vars.pip, this.platform, this.arch, this.gpu, this.gpus, this.kernel)
|
|
220
219
|
console.log("response", response)
|
|
221
220
|
if (typeof response === "undefined") {
|
|
222
221
|
return `{{${o}}}`
|