fix: clamp z.ai developer role
This commit is contained in:
44
src/agents/model-compat.test.ts
Normal file
44
src/agents/model-compat.test.ts
Normal file
@@ -0,0 +1,44 @@
|
||||
import type { Api, Model } from "@mariozechner/pi-ai";
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { normalizeModelCompat } from "./model-compat.js";
|
||||
|
||||
const baseModel = (): Model<Api> =>
|
||||
({
|
||||
id: "glm-4.7",
|
||||
name: "GLM-4.7",
|
||||
api: "openai-completions",
|
||||
provider: "zai",
|
||||
baseUrl: "https://api.z.ai/api/coding/paas/v4",
|
||||
reasoning: true,
|
||||
input: ["text"],
|
||||
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
||||
contextWindow: 8192,
|
||||
maxTokens: 1024,
|
||||
}) as Model<Api>;
|
||||
|
||||
describe("normalizeModelCompat", () => {
|
||||
it("forces supportsDeveloperRole off for z.ai models", () => {
|
||||
const model = baseModel();
|
||||
delete (model as { compat?: unknown }).compat;
|
||||
const normalized = normalizeModelCompat(model);
|
||||
expect(normalized.compat?.supportsDeveloperRole).toBe(false);
|
||||
});
|
||||
|
||||
it("leaves non-zai models untouched", () => {
|
||||
const model = {
|
||||
...baseModel(),
|
||||
provider: "openai",
|
||||
baseUrl: "https://api.openai.com/v1",
|
||||
};
|
||||
delete (model as { compat?: unknown }).compat;
|
||||
const normalized = normalizeModelCompat(model);
|
||||
expect(normalized.compat).toBeUndefined();
|
||||
});
|
||||
|
||||
it("does not override explicit z.ai compat false", () => {
|
||||
const model = baseModel();
|
||||
model.compat = { supportsDeveloperRole: false };
|
||||
const normalized = normalizeModelCompat(model);
|
||||
expect(normalized.compat?.supportsDeveloperRole).toBe(false);
|
||||
});
|
||||
});
|
||||
13
src/agents/model-compat.ts
Normal file
13
src/agents/model-compat.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
import type { Api, Model } from "@mariozechner/pi-ai";
|
||||
|
||||
export function normalizeModelCompat(model: Model<Api>): Model<Api> {
|
||||
const baseUrl = model.baseUrl ?? "";
|
||||
const isZai = model.provider === "zai" || baseUrl.includes("api.z.ai");
|
||||
if (!isZai) return model;
|
||||
|
||||
const compat = model.compat ?? {};
|
||||
if (compat.supportsDeveloperRole === false) return model;
|
||||
|
||||
model.compat = { ...compat, supportsDeveloperRole: false };
|
||||
return model;
|
||||
}
|
||||
@@ -66,6 +66,7 @@ import {
|
||||
resolveAuthProfileOrder,
|
||||
resolveModelAuthMode,
|
||||
} from "./model-auth.js";
|
||||
import { normalizeModelCompat } from "./model-compat.js";
|
||||
import { ensureClawdbotModelsJson } from "./models-config.js";
|
||||
import type { MessagingToolSend } from "./pi-embedded-messaging.js";
|
||||
import { acquireSessionWriteLock } from "./session-write-lock.js";
|
||||
@@ -762,7 +763,7 @@ function resolveModel(
|
||||
modelRegistry,
|
||||
};
|
||||
}
|
||||
return { model, authStorage, modelRegistry };
|
||||
return { model: normalizeModelCompat(model), authStorage, modelRegistry };
|
||||
}
|
||||
|
||||
export async function compactEmbeddedPiSession(params: {
|
||||
|
||||
Reference in New Issue
Block a user