Skip to content

armgit / SOMA

Public Imported from GitHub
0

Desktop app for designing parametric 3D models in CadQuery together with the coding agent of your choice

App: Python ohne Bytecode-Cache starten (pythonEnv)

Kai-Jungsthoefel7ee511f2686f
diff --git a/app/src/main/about.ts b/app/src/main/about.ts
index de85eb3..a98e56b 100644
--- a/app/src/main/about.ts
+++ b/app/src/main/about.ts
@@ -7,7 +7,7 @@ import { exec } from 'dugite';
import type { AboutInfo, AgentInfo, ComponentInfo } from '../shared/types';
import { SOMA_VERSION } from '../shared/version';
import { logTail } from './log';
-import { logsDir, pythonExe, userDataDir, userSkillsDir, warmDir } from './paths';
+import { logsDir, pythonEnv, pythonExe, userDataDir, userSkillsDir, warmDir } from './paths';
/**
* Angaben für „About“ in den Einstellungen (E81): Versionen, Komponenten mit Lizenz, gefundene Agenten, Pfade. Alles wird
@@ -77,7 +77,7 @@ function pythonInfo(): Promise<AboutInfo['python']> {
const cwd = warmDir();
try { fs.mkdirSync(cwd, { recursive: true }); } catch { /* dann eben ohne */ }
// Leerer Startordner: Python setzt ihn bei -c vorn in den Suchpfad (siehe warmDir)
- execFile(exe, ['-c', PY_INFO], { cwd, timeout: 30000, windowsHide: true, env: { ...process.env, PYTHONUTF8: '1', PYTHONIOENCODING: 'utf-8' } }, (err, out, errOut) => {
+ execFile(exe, ['-c', PY_INFO], { cwd, timeout: 30000, windowsHide: true, env: pythonEnv() }, (err, out, errOut) => {
if (err) { pyCache = null; resolve({ exe, packages: [], error: (String(errOut).trim().split('\n').pop() || err.message).slice(0, 300) }); return; }
try {
const j = JSON.parse(String(out).trim().split('\n').pop() ?? '') as { version: string; executable: string; packages: ComponentInfo[] };
diff --git a/app/src/main/build.ts b/app/src/main/build.ts
index 8e9f1d1..f90af9f 100644
--- a/app/src/main/build.ts
+++ b/app/src/main/build.ts
@@ -5,7 +5,7 @@ import { EventEmitter } from 'node:events';
import { affectsBuild } from '../shared/editable';
import type { BuildResult, BuildStatus, ParamInfo } from '../shared/types';
import { log } from './log';
-import { pythonExe, warmDir } from './paths';
+import { pythonEnv, pythonExe, warmDir } from './paths';
import { IGNORED_TOP } from './watcher';
const DEBOUNCE_MS = 700;
@@ -315,7 +315,7 @@ function spawnWarm(): WarmProcess {
try { fs.mkdirSync(cwd, { recursive: true }); } catch { /* dann scheitert der Start und meldet es */ }
const child = spawn(pythonExe(), ['-m', 'soma', 'warm'], {
cwd, windowsHide: true,
- env: { ...process.env, PYTHONUTF8: '1', PYTHONIOENCODING: 'utf-8', PYTHONUNBUFFERED: '1' },
+ env: pythonEnv({ PYTHONUNBUFFERED: '1' }),
});
const w: WarmProcess = { child, out: '', err: '', lines: [], ended: false, error: null, onLine: null, onError: null, onClose: null };
let partial = '';
diff --git a/app/src/main/measure.ts b/app/src/main/measure.ts
index b5c338b..6eb31da 100644
--- a/app/src/main/measure.ts
+++ b/app/src/main/measure.ts
@@ -1,6 +1,6 @@
import { spawn, type ChildProcess } from 'node:child_process';
import type { MeasurePrepared, MeasureRequest, MeasureResponse } from '../shared/types';
-import { pythonExe } from './paths';
+import { pythonEnv, pythonExe } from './paths';
const START_TIMEOUT_MS = 60_000; // cadquery zu laden dauert beim ersten Mal einige Sekunden
const REQUEST_TIMEOUT_MS = 30_000;
@@ -65,7 +65,7 @@ export class MeasureService {
this.buf = '';
const child = spawn(pythonExe(), ['-m', 'soma', 'serve'], {
cwd: this.cwd, windowsHide: true, stdio: ['pipe', 'pipe', 'pipe'],
- env: { ...process.env, PYTHONUTF8: '1', PYTHONIOENCODING: 'utf-8', PYTHONUNBUFFERED: '1' },
+ env: pythonEnv({ PYTHONUNBUFFERED: '1' }),
});
this.proc = child;
let err = '';
diff --git a/app/src/main/packages.ts b/app/src/main/packages.ts
index 960b6ce..5bdfa1a 100644
--- a/app/src/main/packages.ts
+++ b/app/src/main/packages.ts
@@ -3,7 +3,7 @@ import fs from 'node:fs';
import path from 'node:path';
import { samePath } from './animations';
import { resolveInside } from './files';
-import { pythonExe, warmDir } from './paths';
+import { pythonEnv, pythonExe, warmDir } from './paths';
/**
* Projektumgebung (E25, E67): eine kleine venv je Modell unter .soma/env, angelegt von `soma env` (python/soma/env.py).
@@ -54,7 +54,7 @@ function run(exe: string, args: string[], cwd: string, timeoutMs: number): Promi
let out = '', err = '';
let child: ChildProcess;
try {
- child = spawn(exe, args, { cwd, windowsHide: true, env: { ...process.env, PIP_PYTHON: undefined, PYTHONUTF8: '1', PYTHONIOENCODING: 'utf-8' } });
+ child = spawn(exe, args, { cwd, windowsHide: true, env: pythonEnv({ PIP_PYTHON: undefined }) });
} catch (e) { resolve({ code: null, out, err: e instanceof Error ? e.message : String(e) }); return; }
const timer = setTimeout(() => { err += '\nTime limit exceeded.'; child.kill(); }, timeoutMs);
child.stdout?.on('data', (d: Buffer) => { out += d.toString('utf8'); });
diff --git a/app/src/main/paths.ts b/app/src/main/paths.ts
index a1ae635..4c7ada7 100644
--- a/app/src/main/paths.ts
+++ b/app/src/main/paths.ts
@@ -77,6 +77,16 @@ export function pythonExe(): string {
return process.platform === 'win32' ? 'python.exe' : 'python3';
}
+/**
+ * Umgebung für alle Python-Prozesse der App und die Terminals. PYTHONDONTWRITEBYTECODE: Python legt keine __pycache__
+ * an. Die mitgelieferte Basisumgebung liegt unter macOS im signierten SOMA.app, jede neue .pyc darin machte die
+ * Signatur ungültig (Fork mjoconr/SOMA). Schnell bleibt der Start trotzdem: build_runtime.py übersetzt die Basis
+ * vorab. Nebenbei entsteht auch in Projektordnern kein __pycache__ mehr.
+ */
+export function pythonEnv(extra: NodeJS.ProcessEnv = {}): NodeJS.ProcessEnv {
+ return { ...process.env, PYTHONUTF8: '1', PYTHONIOENCODING: 'utf-8', PYTHONDONTWRITEBYTECODE: '1', ...extra };
+}
+
/** Ordner des mitgelieferten Git (dugite). Kommt in die Terminals, damit Agent und App dasselbe Git benutzen (E31). */
export function gitCmdDir(): string | null {
try {
diff --git a/app/src/main/terminals.ts b/app/src/main/terminals.ts
index f772268..8acc0ca 100644
--- a/app/src/main/terminals.ts
+++ b/app/src/main/terminals.ts
@@ -4,7 +4,7 @@ import * as pty from 'node-pty';
import { logAgentStart } from './agents';
import { bridgeEnv } from './bridge';
import { envPaths } from './packages';
-import { gitCmdDir, pythonBinDirs } from './paths';
+import { gitCmdDir, pythonBinDirs, pythonEnv } from './paths';
/**
* Umgebung fuer Terminals: vorn im PATH die Projektumgebung (E67, `python` sieht Basis und Zusatzpakete), dahinter die
@@ -12,7 +12,7 @@ import { gitCmdDir, pythonBinDirs } from './paths';
* Adresse und Schluessel der App fuer `soma render` (E58).
*/
export function terminalEnv(projectDir: string): NodeJS.ProcessEnv {
- const env: NodeJS.ProcessEnv = { ...process.env, PYTHONUTF8: '1', SOMA_PROJECT: projectDir, ...bridgeEnv() };
+ const env: NodeJS.ProcessEnv = pythonEnv({ SOMA_PROJECT: projectDir, ...bridgeEnv() });
const key = Object.keys(env).find((k) => k.toLowerCase() === 'path') ?? 'PATH';
const pe = envPaths(projectDir);
const front: string[] = [pe.scripts];