pinokiod 3.2.161 → 3.2.163

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.
Files changed (12) hide show
  1. package/kernel/bin/aria2.js +1 -1
  2. package/kernel/bin/conda.js +1 -1
  3. package/kernel/bin/cuda.js +4 -4
  4. package/kernel/bin/ffmpeg.js +1 -1
  5. package/kernel/bin/git.js +1 -1
  6. package/kernel/bin/huggingface.js +1 -1
  7. package/kernel/bin/llvm.js +1 -1
  8. package/kernel/bin/node.js +1 -1
  9. package/kernel/bin/uv.js +1 -1
  10. package/kernel/bin/zip.js +2 -2
  11. package/kernel/shell.js +22 -18
  12. package/package.json +1 -1
package/kernel/bin/aria2.js CHANGED
@@ -20,7 +20,7 @@ class Aria2 {
20
20
  await this.kernel.bin.exec({
21
21
  message: [
22
22
  "conda clean -y --all",
23
- "conda install -y -c conda-forge aria2"
23
+ "conda install -y -c conda-forge aria2 --debug -vvv"
24
24
  ]
25
25
  }, ondata)
26
26
  }
package/kernel/bin/conda.js CHANGED
@@ -236,7 +236,7 @@ create_default_packages:
236
236
  //"conda install -y conda-libmamba-solver=24.11.1 conda=24.7.1",
237
237
  //"conda install -y conda-libmamba-solver=24.11.1 conda=24.11.2",
238
238
  //"conda update -y conda-libmamba-solver",
239
- "conda update -y --all",// -vvv --debug",
239
+ "conda update -y --all --debug -vvv",// -vvv --debug",
240
240
  // "conda update -y conda",
241
241
  // "conda update -y --all",
242
242
  ]
package/kernel/bin/cuda.js CHANGED
@@ -4,7 +4,7 @@ class Cuda {
4
4
  await this.kernel.bin.exec({
5
5
  message: [
6
6
  "conda clean -y --all",
7
- "conda install -y cudnn libzlib-wapi -c conda-forge",
7
+ "conda install -y cudnn libzlib-wapi -c conda-forge --debug -vvv",
8
8
  ]
9
9
  // conda: {
10
10
  // name: "base",
@@ -14,7 +14,7 @@ class Cuda {
14
14
  await this.kernel.bin.exec({
15
15
  message: [
16
16
  "conda clean -y --all",
17
- "conda install -y cuda -c nvidia/label/cuda-12.1.0",
17
+ "conda install -y cuda -c nvidia/label/cuda-12.1.0 --debug -vvv",
18
18
  ]
19
19
  // conda: {
20
20
  // name: "base",
@@ -25,7 +25,7 @@ class Cuda {
25
25
  await this.kernel.bin.exec({
26
26
  message: [
27
27
  "conda clean -y --all",
28
- "conda install -y cudnn -c conda-forge",
28
+ "conda install -y cudnn -c conda-forge --debug -vvv",
29
29
  ]
30
30
  // conda: {
31
31
  // name: "base",
@@ -35,7 +35,7 @@ class Cuda {
35
35
  await this.kernel.bin.exec({
36
36
  message: [
37
37
  "conda clean -y --all",
38
- "conda install -y cuda -c nvidia/label/cuda-12.1.0",
38
+ "conda install -y cuda -c nvidia/label/cuda-12.1.0 --debug -vvv",
39
39
  ]
40
40
  // conda: {
41
41
  // name: "base",
package/kernel/bin/ffmpeg.js CHANGED
@@ -7,7 +7,7 @@ class Ffmpeg {
7
7
  await this.kernel.bin.exec({
8
8
  message: [
9
9
  "conda clean -y --all",
10
- "conda install -y -c conda-forge ffmpeg",
10
+ "conda install -y -c conda-forge ffmpeg --debug -vvv",
11
11
  ]
12
12
  // conda: {
13
13
  // name: "base",
package/kernel/bin/git.js CHANGED
@@ -8,7 +8,7 @@ class Git {
8
8
  await this.kernel.bin.exec({
9
9
  message: [
10
10
  "conda clean -y --all",
11
- "conda install --no-shortcuts -y -c conda-forge git git-lfs"
11
+ "conda install --no-shortcuts -y -c conda-forge git git-lfs --debug -vvv"
12
12
  ]
13
13
  // conda: {
14
14
  // name: "base",
package/kernel/bin/huggingface.js CHANGED
@@ -3,7 +3,7 @@ class Huggingface {
3
3
  await this.kernel.bin.exec({
4
4
  message: [
5
5
  "conda clean -y --all",
6
- "conda install -y -c conda-forge huggingface_hub"
6
+ "conda install -y -c conda-forge huggingface_hub --debug -vvv"
7
7
  ]
8
8
  // conda: {
9
9
  // name: "base",
package/kernel/bin/llvm.js CHANGED
@@ -6,7 +6,7 @@ class LLVM {
6
6
  await bin.exec({
7
7
  message: [
8
8
  "conda clean -y --all",
9
- "conda install -y -c conda-forge llvm"
9
+ "conda install -y -c conda-forge llvm --debug -vvv"
10
10
  ]
11
11
  // conda: {
12
12
  // name: "base",
package/kernel/bin/node.js CHANGED
@@ -8,7 +8,7 @@ class Node {
8
8
  //message: "conda install -y nodejs=22.12.0 -c conda-forge"
9
9
  message: [
10
10
  "conda clean -y --all",
11
- "conda install -y nodejs=20.17.0 pnpm -c conda-forge"
11
+ "conda install -y nodejs=20.17.0 pnpm -c conda-forge --debug -vvv"
12
12
  ]
13
13
  // conda: {
14
14
  // name: "base",
package/kernel/bin/uv.js CHANGED
@@ -7,7 +7,7 @@ class UV {
7
7
  await this.kernel.bin.exec({
8
8
  message: [
9
9
  "conda clean -y --all",
10
- "conda install -y -c conda-forge uv",
10
+ "conda install -y -c conda-forge uv --debug -vvv",
11
11
  ]
12
12
  // conda: {
13
13
  // name: "base",
package/kernel/bin/zip.js CHANGED
@@ -2,9 +2,9 @@ class Zip {
2
2
  async install(req, ondata) {
3
3
  let cmd
4
4
  if (this.kernel.platform === 'win32') {
5
- cmd = "conda install -y -c conda-forge 7zip"
5
+ cmd = "conda install -y -c conda-forge 7zip --debug -vvv"
6
6
  } else {
7
- cmd = "conda install -y -c conda-forge p7zip"
7
+ cmd = "conda install -y -c conda-forge p7zip --debug -vvv"
8
8
  }
9
9
  await this.kernel.bin.exec({
10
10
  message: [
package/kernel/shell.js CHANGED
@@ -554,18 +554,18 @@ class Shell {
554
554
  if (env_exists) {
555
555
  conda_activation = [
556
556
  (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
557
- // `conda deactivate`,
558
- // `conda deactivate`,
559
- // `conda deactivate`,
557
+ `conda deactivate`,
558
+ `conda deactivate`,
559
+ `conda deactivate`,
560
560
  `conda activate ${env_path}`,
561
561
  ]
562
562
  } else {
563
563
  conda_activation = [
564
564
  (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
565
565
  `conda create -y -p ${env_path} ${conda_python} ${conda_args ? conda_args : ''}`,
566
- // `conda deactivate`,
567
- // `conda deactivate`,
568
- // `conda deactivate`,
566
+ `conda deactivate`,
567
+ `conda deactivate`,
568
+ `conda deactivate`,
569
569
  `conda activate ${env_path}`,
570
570
  ]
571
571
  }
@@ -573,9 +573,9 @@ class Shell {
573
573
  if (conda_name === "base") {
574
574
  conda_activation = [
575
575
  (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
576
- // `conda deactivate`,
577
- // `conda deactivate`,
578
- // `conda deactivate`,
576
+ `conda deactivate`,
577
+ `conda deactivate`,
578
+ `conda deactivate`,
579
579
  `conda activate ${conda_name}`,
580
580
  ]
581
581
  } else {
@@ -585,18 +585,18 @@ class Shell {
585
585
  if (env_exists) {
586
586
  conda_activation = [
587
587
  (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
588
- // `conda deactivate`,
589
- // `conda deactivate`,
590
- // `conda deactivate`,
588
+ `conda deactivate`,
589
+ `conda deactivate`,
590
+ `conda deactivate`,
591
591
  `conda activate ${conda_name}`,
592
592
  ]
593
593
  } else {
594
594
  conda_activation = [
595
595
  (this.platform === 'win32' ? 'conda_hook' : `eval "$(conda shell.bash hook)"`),
596
596
  `conda create -y -n ${conda_name} ${conda_python} ${conda_args ? conda_args : ''}`,
597
- // `conda deactivate`,
598
- // `conda deactivate`,
599
- // `conda deactivate`,
597
+ `conda deactivate`,
598
+ `conda deactivate`,
599
+ `conda deactivate`,
600
600
  `conda activate ${conda_name}`,
601
601
  ]
602
602
  }
@@ -662,7 +662,13 @@ class Shell {
662
662
  }
663
663
 
664
664
  // 3. construct params.message
665
- params.message = conda_activation.concat(venv_activation).concat(params.message)
665
+ params.message = conda_activation.concat(venv_activation).concat(params.message).map((cmd) => {
666
+ if (this.platform === 'win32') {
667
+ return `call ${cmd}`
668
+ } else {
669
+ return cmd
670
+ }
671
+ })
666
672
  return params
667
673
  }
668
674
  async exec(params) {
@@ -828,7 +834,6 @@ ${cleaned}
828
834
 
829
835
  }
830
836
  stream(msg, callback) {
831
- console.log("# STREAM", msg)
832
837
  this.vt.write(msg, () => {
833
838
  let buf = this.vts.serialize()
834
839
  let cleaned = this.stripAnsi(buf)
@@ -846,7 +851,6 @@ ${cleaned}
846
851
  let termination_prompt_re = new RegExp(this.prompt_pattern + "[ \r\n]*$", "g")
847
852
  let line = cleaned.replaceAll(/[\r\n]/g, "")
848
853
  let test = line.match(termination_prompt_re)
849
- console.log({ line, test, termination_prompt_re })
850
854
  if (test) {
851
855
  let cache = cleaned
852
856
  let cached_msg = msg
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "pinokiod",
3
- "version": "3.2.161",
3
+ "version": "3.2.163",
4
4
  "description": "",
5
5
  "main": "index.js",
6
6
  "scripts": {