mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-06 07:00:43 +00:00
QA: replace qa-lab-runtime with qa-runtime
Introduce a tiny generic qa-runtime seam for shared live-lane helpers and repoint qa-matrix to it. This keeps the qa-lab host split while removing the host-owned runtime name from runner code. Drop the old qa-lab-runtime shim/export now that nothing consumes it and keep the plugin-sdk surface aligned with the new seam.
This commit is contained in:
@@ -1,18 +1,20 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
const loadQaLabRuntimeModule = vi.hoisted(() => vi.fn());
|
||||
const loadQaRuntimeModule = vi.hoisted(() => vi.fn());
|
||||
const defaultQaRuntimeModelForMode = vi.hoisted(() => vi.fn());
|
||||
|
||||
vi.mock("openclaw/plugin-sdk/qa-lab-runtime", () => ({
|
||||
loadQaLabRuntimeModule,
|
||||
vi.mock("openclaw/plugin-sdk/qa-runtime", () => ({
|
||||
loadQaRuntimeModule,
|
||||
}));
|
||||
|
||||
describe("matrix qa model selection", () => {
|
||||
beforeEach(() => {
|
||||
defaultQaRuntimeModelForMode.mockReset().mockImplementation((mode, options) =>
|
||||
options?.alternate ? `${mode}:alt` : `${mode}:primary`,
|
||||
);
|
||||
loadQaLabRuntimeModule.mockReset().mockReturnValue({
|
||||
defaultQaRuntimeModelForMode
|
||||
.mockReset()
|
||||
.mockImplementation((mode, options) =>
|
||||
options?.alternate ? `${mode}:alt` : `${mode}:primary`,
|
||||
);
|
||||
loadQaRuntimeModule.mockReset().mockReturnValue({
|
||||
defaultQaRuntimeModelForMode,
|
||||
});
|
||||
});
|
||||
@@ -45,7 +47,7 @@ describe("matrix qa model selection", () => {
|
||||
primaryModel: "custom-primary",
|
||||
alternateModel: "custom-alt",
|
||||
});
|
||||
expect(loadQaLabRuntimeModule).not.toHaveBeenCalled();
|
||||
expect(loadQaRuntimeModule).not.toHaveBeenCalled();
|
||||
expect(defaultQaRuntimeModelForMode).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { loadQaLabRuntimeModule } from "openclaw/plugin-sdk/qa-lab-runtime";
|
||||
import { loadQaRuntimeModule } from "openclaw/plugin-sdk/qa-runtime";
|
||||
import { normalizeQaProviderMode, type QaProviderModeInput } from "../../run-config.js";
|
||||
|
||||
export type ResolvedMatrixQaModels = {
|
||||
@@ -23,11 +23,11 @@ export function resolveMatrixQaModels(params: {
|
||||
};
|
||||
}
|
||||
|
||||
const qaLabRuntime = loadQaLabRuntimeModule();
|
||||
const qaRuntime = loadQaRuntimeModule();
|
||||
return {
|
||||
providerMode,
|
||||
primaryModel: primaryModel || qaLabRuntime.defaultQaRuntimeModelForMode(providerMode),
|
||||
primaryModel: primaryModel || qaRuntime.defaultQaRuntimeModelForMode(providerMode),
|
||||
alternateModel:
|
||||
alternateModel || qaLabRuntime.defaultQaRuntimeModelForMode(providerMode, { alternate: true }),
|
||||
alternateModel || qaRuntime.defaultQaRuntimeModelForMode(providerMode, { alternate: true }),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,7 +4,7 @@ import path from "node:path";
|
||||
import { setTimeout as sleep } from "node:timers/promises";
|
||||
import type { OpenClawConfig } from "openclaw/plugin-sdk/config-runtime";
|
||||
import { formatErrorMessage } from "openclaw/plugin-sdk/error-runtime";
|
||||
import { loadQaLabRuntimeModule } from "openclaw/plugin-sdk/qa-lab-runtime";
|
||||
import { loadQaRuntimeModule } from "openclaw/plugin-sdk/qa-runtime";
|
||||
import type { QaReportCheck } from "../../report.js";
|
||||
import { renderQaMarkdownReport } from "../../report.js";
|
||||
import { type QaProviderModeInput } from "../../run-config.js";
|
||||
@@ -18,6 +18,7 @@ import {
|
||||
type MatrixQaProvisionResult,
|
||||
} from "../../substrate/client.js";
|
||||
import { startMatrixQaHarness } from "../../substrate/harness.runtime.js";
|
||||
import { resolveMatrixQaModels } from "./model-selection.js";
|
||||
import {
|
||||
MATRIX_QA_SCENARIOS,
|
||||
buildMatrixReplyDetails,
|
||||
@@ -27,7 +28,6 @@ import {
|
||||
type MatrixQaCanaryArtifact,
|
||||
type MatrixQaScenarioArtifacts,
|
||||
} from "./scenarios.js";
|
||||
import { resolveMatrixQaModels } from "./model-selection.js";
|
||||
|
||||
type MatrixQaGatewayChild = {
|
||||
call(
|
||||
@@ -284,7 +284,7 @@ async function startMatrixQaLiveLaneGateway(params: {
|
||||
controlUiEnabled?: boolean;
|
||||
mutateConfig?: (cfg: OpenClawConfig) => OpenClawConfig;
|
||||
}): Promise<MatrixQaLiveLaneGatewayHarness> {
|
||||
return (await loadQaLabRuntimeModule().startQaLiveLaneGateway(
|
||||
return (await loadQaRuntimeModule().startQaLiveLaneGateway(
|
||||
params,
|
||||
)) as MatrixQaLiveLaneGatewayHarness;
|
||||
}
|
||||
|
||||
@@ -765,9 +765,9 @@
|
||||
"types": "./dist/plugin-sdk/matrix-thread-bindings.d.ts",
|
||||
"default": "./dist/plugin-sdk/matrix-thread-bindings.js"
|
||||
},
|
||||
"./plugin-sdk/qa-lab-runtime": {
|
||||
"types": "./dist/plugin-sdk/qa-lab-runtime.d.ts",
|
||||
"default": "./dist/plugin-sdk/qa-lab-runtime.js"
|
||||
"./plugin-sdk/qa-runtime": {
|
||||
"types": "./dist/plugin-sdk/qa-runtime.d.ts",
|
||||
"default": "./dist/plugin-sdk/qa-runtime.js"
|
||||
},
|
||||
"./plugin-sdk/qa-runner-runtime": {
|
||||
"types": "./dist/plugin-sdk/qa-runner-runtime.d.ts",
|
||||
|
||||
@@ -179,7 +179,7 @@
|
||||
"matrix-runtime-surface",
|
||||
"matrix-surface",
|
||||
"matrix-thread-bindings",
|
||||
"qa-lab-runtime",
|
||||
"qa-runtime",
|
||||
"qa-runner-runtime",
|
||||
"mattermost",
|
||||
"mattermost-policy",
|
||||
|
||||
47
src/plugin-sdk/qa-runtime.test.ts
Normal file
47
src/plugin-sdk/qa-runtime.test.ts
Normal file
@@ -0,0 +1,47 @@
|
||||
import { beforeEach, describe, expect, it, vi } from "vitest";
|
||||
|
||||
const loadBundledPluginPublicSurfaceModuleSync = vi.hoisted(() => vi.fn());
|
||||
|
||||
vi.mock("./facade-runtime.js", () => ({
|
||||
loadBundledPluginPublicSurfaceModuleSync,
|
||||
}));
|
||||
|
||||
describe("plugin-sdk qa-runtime", () => {
|
||||
beforeEach(() => {
|
||||
loadBundledPluginPublicSurfaceModuleSync.mockReset();
|
||||
});
|
||||
|
||||
it("stays cold until the runtime seam is used", async () => {
|
||||
const module = await import("./qa-runtime.js");
|
||||
|
||||
expect(loadBundledPluginPublicSurfaceModuleSync).not.toHaveBeenCalled();
|
||||
expect(typeof module.loadQaRuntimeModule).toBe("function");
|
||||
expect(typeof module.isQaRuntimeAvailable).toBe("function");
|
||||
});
|
||||
|
||||
it("loads the qa-lab runtime public surface through the generic seam", async () => {
|
||||
const runtimeSurface = {
|
||||
defaultQaRuntimeModelForMode: vi.fn(),
|
||||
startQaLiveLaneGateway: vi.fn(),
|
||||
};
|
||||
loadBundledPluginPublicSurfaceModuleSync.mockReturnValue(runtimeSurface);
|
||||
|
||||
const module = await import("./qa-runtime.js");
|
||||
|
||||
expect(module.loadQaRuntimeModule()).toBe(runtimeSurface);
|
||||
expect(loadBundledPluginPublicSurfaceModuleSync).toHaveBeenCalledWith({
|
||||
dirName: "qa-lab",
|
||||
artifactBasename: "runtime-api.js",
|
||||
});
|
||||
});
|
||||
|
||||
it("reports the runtime as unavailable when the qa-lab surface is missing", async () => {
|
||||
loadBundledPluginPublicSurfaceModuleSync.mockImplementation(() => {
|
||||
throw new Error("Unable to resolve bundled plugin public surface qa-lab/runtime-api.js");
|
||||
});
|
||||
|
||||
const module = await import("./qa-runtime.js");
|
||||
|
||||
expect(module.isQaRuntimeAvailable()).toBe(false);
|
||||
});
|
||||
});
|
||||
39
src/plugin-sdk/qa-runtime.ts
Normal file
39
src/plugin-sdk/qa-runtime.ts
Normal file
@@ -0,0 +1,39 @@
|
||||
import { loadBundledPluginPublicSurfaceModuleSync } from "./facade-runtime.js";
|
||||
|
||||
type QaRuntimeSurface = {
|
||||
defaultQaRuntimeModelForMode: (
|
||||
mode: string,
|
||||
options?: {
|
||||
alternate?: boolean;
|
||||
preferredLiveModel?: string;
|
||||
},
|
||||
) => string;
|
||||
startQaLiveLaneGateway: (...args: unknown[]) => Promise<unknown>;
|
||||
};
|
||||
|
||||
function isMissingQaRuntimeError(error: unknown) {
|
||||
return (
|
||||
error instanceof Error &&
|
||||
(error.message === "Unable to resolve bundled plugin public surface qa-lab/runtime-api.js" ||
|
||||
error.message.startsWith("Unable to open bundled plugin public surface "))
|
||||
);
|
||||
}
|
||||
|
||||
export function loadQaRuntimeModule(): QaRuntimeSurface {
|
||||
return loadBundledPluginPublicSurfaceModuleSync<QaRuntimeSurface>({
|
||||
dirName: "qa-lab",
|
||||
artifactBasename: "runtime-api.js",
|
||||
});
|
||||
}
|
||||
|
||||
export function isQaRuntimeAvailable(): boolean {
|
||||
try {
|
||||
loadQaRuntimeModule();
|
||||
return true;
|
||||
} catch (error) {
|
||||
if (isMissingQaRuntimeError(error)) {
|
||||
return false;
|
||||
}
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user