can1357
cb5bbbf382
- Eliminated core/ directory (252 files, 23 subdirs → distributed)
- Reduced max nesting from 9 levels to 5 levels
- Promoted tool subdirs to top level: exa/, lsp/, patch/, task/, web/
- Merged web-scrapers/ + web-search/ into web/{scrapers,search}/
- Flattened modes/interactive/ to modes/
- Split execution/ into: ipy/ (python), exec/ (bash), ssh/
- Renamed ipy/python-*.ts to ipy/*.ts (executor, kernel, etc.)
- Flattened cursor/exec-bridge.ts to cursor.ts
- Created logical groupings: config/, session/, extensibility/, export/
- Updated all imports across 500+ files
92 lines
2.7 KiB
TypeScript
92 lines
2.7 KiB
TypeScript
import { afterEach, beforeEach, describe, expect, it } from "bun:test";
|
|
import { createTempDirSync } from "@oh-my-pi/pi-utils";
|
|
import { disposeAllKernelSessions, executePython } from "$c/ipy/executor";
|
|
import type { KernelExecuteOptions, KernelExecuteResult } from "$c/ipy/kernel";
|
|
import { PythonKernel } from "$c/ipy/kernel";
|
|
|
|
class FakeKernel {
|
|
executeCalls = 0;
|
|
shutdownCalls = 0;
|
|
alive = true;
|
|
readonly id: string;
|
|
|
|
constructor(id: string) {
|
|
this.id = id;
|
|
}
|
|
|
|
async execute(_code: string, options?: KernelExecuteOptions): Promise<KernelExecuteResult> {
|
|
this.executeCalls += 1;
|
|
options?.onChunk?.("ok\n");
|
|
return { status: "ok", cancelled: false, timedOut: false, stdinRequested: false };
|
|
}
|
|
|
|
async shutdown(): Promise<void> {
|
|
this.shutdownCalls += 1;
|
|
this.alive = false;
|
|
}
|
|
|
|
isAlive(): boolean {
|
|
return this.alive;
|
|
}
|
|
|
|
async ping(): Promise<boolean> {
|
|
return this.alive;
|
|
}
|
|
}
|
|
|
|
describe("executePython kernel reuse", () => {
|
|
const originalStart = PythonKernel.start;
|
|
let startCalls = 0;
|
|
let kernels: FakeKernel[] = [];
|
|
|
|
beforeEach(() => {
|
|
process.env.OMP_PYTHON_SKIP_CHECK = "1";
|
|
startCalls = 0;
|
|
kernels = [];
|
|
PythonKernel.start = (async () => {
|
|
startCalls += 1;
|
|
const kernel = new FakeKernel(`kernel-${startCalls}`);
|
|
kernels.push(kernel);
|
|
return kernel as unknown as PythonKernel;
|
|
}) as typeof PythonKernel.start;
|
|
});
|
|
|
|
afterEach(async () => {
|
|
PythonKernel.start = originalStart;
|
|
await disposeAllKernelSessions();
|
|
});
|
|
|
|
it("reuses kernels for session mode", async () => {
|
|
using tempDir = createTempDirSync("@python-kernel-session-");
|
|
await executePython("print('one')", { cwd: tempDir.path, sessionId: "session-a", kernelMode: "session" });
|
|
await executePython("print('two')", { cwd: tempDir.path, sessionId: "session-a", kernelMode: "session" });
|
|
|
|
expect(startCalls).toBe(1);
|
|
expect(kernels[0]?.executeCalls).toBe(2);
|
|
});
|
|
|
|
it("creates and disposes per-call kernels", async () => {
|
|
using tempDir = createTempDirSync("@python-kernel-session-");
|
|
await executePython("print('one')", { cwd: tempDir.path, kernelMode: "per-call" });
|
|
await executePython("print('two')", { cwd: tempDir.path, kernelMode: "per-call" });
|
|
|
|
expect(startCalls).toBe(2);
|
|
expect(kernels[0]?.shutdownCalls).toBe(1);
|
|
expect(kernels[1]?.shutdownCalls).toBe(1);
|
|
});
|
|
|
|
it("resets the session kernel when requested", async () => {
|
|
using tempDir = createTempDirSync("@python-kernel-session-");
|
|
await executePython("print('one')", { cwd: tempDir.path, sessionId: "session-b", kernelMode: "session" });
|
|
await executePython("print('two')", {
|
|
cwd: tempDir.path,
|
|
sessionId: "session-b",
|
|
kernelMode: "session",
|
|
reset: true,
|
|
});
|
|
|
|
expect(startCalls).toBe(2);
|
|
expect(kernels[0]?.shutdownCalls).toBe(1);
|
|
});
|
|
});
|