fix: register qoder-api for pi global streamSimple
Pi 0.84+ no longer registers custom APIs from registerProvider.streamSimple, so a later agent-loop path threw No API provider registered for api: qoder-api.
This commit is contained in:
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "pi-provider-qoder",
|
"name": "pi-provider-qoder",
|
||||||
"version": "0.4.0",
|
"version": "0.4.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "pi-provider-qoder",
|
"name": "pi-provider-qoder",
|
||||||
"version": "0.4.0",
|
"version": "0.4.1",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@biomejs/biome": "2.4.2",
|
"@biomejs/biome": "2.4.2",
|
||||||
|
|||||||
+2
-2
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pi-provider-qoder",
|
"name": "pi-provider-qoder",
|
||||||
"version": "0.4.0",
|
"version": "0.4.1",
|
||||||
"description": "Pi extension for Qoder AI \u2014 with OAuth authentication, COSY signatures and WAF bypass",
|
"description": "Pi extension for Qoder AI \u2014 with OAuth authentication, COSY signatures and WAF bypass",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
@@ -19,7 +19,7 @@
|
|||||||
"README.md"
|
"README.md"
|
||||||
],
|
],
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --external:@earendil-works/pi-ai --external:@earendil-works/pi-coding-agent",
|
"build": "esbuild src/index.ts --bundle --platform=node --format=esm --outfile=dist/index.js --external:@earendil-works/pi-ai --external:@earendil-works/pi-coding-agent --external:@earendil-works/pi-ai/compat",
|
||||||
"check": "node node_modules/typescript/bin/tsc --noEmit",
|
"check": "node node_modules/typescript/bin/tsc --noEmit",
|
||||||
"lint": "node node_modules/@biomejs/biome/bin/biome check .",
|
"lint": "node node_modules/@biomejs/biome/bin/biome check .",
|
||||||
"lint:fix": "node node_modules/@biomejs/biome/bin/biome check --write .",
|
"lint:fix": "node node_modules/@biomejs/biome/bin/biome check --write .",
|
||||||
|
|||||||
@@ -82,6 +82,7 @@ describe("staticCnModels", () => {
|
|||||||
expect(m.id).toBeTruthy();
|
expect(m.id).toBeTruthy();
|
||||||
expect(m.name).toBeTruthy();
|
expect(m.name).toBeTruthy();
|
||||||
expect(m.api).toBe("qoder-api");
|
expect(m.api).toBe("qoder-api");
|
||||||
|
expect(m.api).not.toBe("qoder-cn-api");
|
||||||
expect(m.provider).toBe("qoder-cn");
|
expect(m.provider).toBe("qoder-cn");
|
||||||
expect(m.baseUrl).toContain("qoder.com.cn");
|
expect(m.baseUrl).toContain("qoder.com.cn");
|
||||||
expect(typeof m.reasoning).toBe("boolean");
|
expect(typeof m.reasoning).toBe("boolean");
|
||||||
|
|||||||
@@ -21,6 +21,21 @@ afterEach(() => {
|
|||||||
vi.resetModules();
|
vi.resetModules();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function liteModel(provider: "qoder" | "qoder-cn") {
|
||||||
|
return {
|
||||||
|
id: "Lite",
|
||||||
|
name: "Lite",
|
||||||
|
api: "qoder-api",
|
||||||
|
provider,
|
||||||
|
baseUrl: provider === "qoder-cn" ? "https://gateway.qoder.com.cn/" : "https://api3.qoder.sh/",
|
||||||
|
reasoning: false,
|
||||||
|
input: ["text"] as const,
|
||||||
|
cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },
|
||||||
|
contextWindow: 1000000,
|
||||||
|
maxTokens: 131072,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
describe("provider region binding", () => {
|
describe("provider region binding", () => {
|
||||||
it("binds qoder to global and qoder-cn to CN", async () => {
|
it("binds qoder to global and qoder-cn to CN", async () => {
|
||||||
for (const name of patEnvNames) delete process.env[name];
|
for (const name of patEnvNames) delete process.env[name];
|
||||||
@@ -68,3 +83,50 @@ describe("provider region binding", () => {
|
|||||||
expect(fetchMock).toHaveBeenLastCalledWith("https://openapi.qoder.com.cn/api/v2/quota/usage", expect.any(Object));
|
expect(fetchMock).toHaveBeenLastCalledWith("https://openapi.qoder.com.cn/api/v2/quota/usage", expect.any(Object));
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
describe("qoder-api registry", () => {
|
||||||
|
it("registers qoder-api so global streamSimple works for both regions", async () => {
|
||||||
|
for (const name of patEnvNames) delete process.env[name];
|
||||||
|
|
||||||
|
// Import compat and the extension in the same test. afterEach resetModules
|
||||||
|
// would otherwise give them separate copies of the API registry Map.
|
||||||
|
const { getApiProvider, streamSimple, unregisterApiProviders } = await import("@earendil-works/pi-ai/compat");
|
||||||
|
const { default: registerProviders } = await import("../index.js");
|
||||||
|
// Node caches node_modules ESM, so a prior test in this file may already
|
||||||
|
// have registered qoder-api. Drop that entry before asserting the empty state.
|
||||||
|
unregisterApiProviders("provider:qoder");
|
||||||
|
const emptyContext = { systemPrompt: "", messages: [] };
|
||||||
|
|
||||||
|
expect(getApiProvider("qoder-api")).toBeUndefined();
|
||||||
|
expect(() => streamSimple(liteModel("qoder") as never, emptyContext)).toThrow(
|
||||||
|
/No API provider registered for api: qoder-api/,
|
||||||
|
);
|
||||||
|
|
||||||
|
const providers = new Map<string, Record<string, unknown>>();
|
||||||
|
const registerProvider = vi.fn((providerID: string, config: Record<string, unknown>) => {
|
||||||
|
providers.set(providerID, config);
|
||||||
|
});
|
||||||
|
const pi = {
|
||||||
|
registerProvider,
|
||||||
|
on: vi.fn(),
|
||||||
|
};
|
||||||
|
|
||||||
|
await registerProviders(pi as never);
|
||||||
|
|
||||||
|
expect(registerProvider).toHaveBeenCalledTimes(2);
|
||||||
|
expect(providers.has("qoder")).toBe(true);
|
||||||
|
expect(providers.has("qoder-cn")).toBe(true);
|
||||||
|
expect(providers.get("qoder")?.api).toBe("qoder-api");
|
||||||
|
expect(providers.get("qoder-cn")?.api).toBe("qoder-api");
|
||||||
|
expect(typeof providers.get("qoder")?.streamSimple).toBe("function");
|
||||||
|
expect(typeof providers.get("qoder-cn")?.streamSimple).toBe("function");
|
||||||
|
|
||||||
|
expect(getApiProvider("qoder-api")).toBeDefined();
|
||||||
|
expect(() => streamSimple(liteModel("qoder") as never, emptyContext)).not.toThrow(
|
||||||
|
/No API provider registered for api: qoder-api/,
|
||||||
|
);
|
||||||
|
expect(() => streamSimple(liteModel("qoder-cn") as never, emptyContext)).not.toThrow(
|
||||||
|
/No API provider registered for api: qoder-api/,
|
||||||
|
);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
+17
-1
@@ -1,4 +1,5 @@
|
|||||||
import type { Api, Model, OAuthCredentials } from "@earendil-works/pi-ai";
|
import type { Api, Model, OAuthCredentials } from "@earendil-works/pi-ai";
|
||||||
|
import { registerApiProvider } from "@earendil-works/pi-ai/compat";
|
||||||
import type { ExtensionAPI, ProviderConfig } from "@earendil-works/pi-coding-agent";
|
import type { ExtensionAPI, ProviderConfig } from "@earendil-works/pi-coding-agent";
|
||||||
import {
|
import {
|
||||||
autoLoginQoderFromEnvironment,
|
autoLoginQoderFromEnvironment,
|
||||||
@@ -17,6 +18,19 @@ type OAuthConfigWithUsage = NonNullable<ProviderConfig["oauth"]> & {
|
|||||||
fetchUsage: (credentials: OAuthCredentials) => Promise<unknown>;
|
fetchUsage: (credentials: OAuthCredentials) => Promise<unknown>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const QODER_API = "qoder-api" as Api;
|
||||||
|
|
||||||
|
function registerQoderApi(): void {
|
||||||
|
registerApiProvider(
|
||||||
|
{
|
||||||
|
api: QODER_API,
|
||||||
|
stream: streamQoder,
|
||||||
|
streamSimple: streamQoder,
|
||||||
|
},
|
||||||
|
"provider:qoder",
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
function modelsForProvider(mode: QoderMode, providerID: string): Model<Api>[] {
|
function modelsForProvider(mode: QoderMode, providerID: string): Model<Api>[] {
|
||||||
const cached = getCachedModels(mode);
|
const cached = getCachedModels(mode);
|
||||||
const modelsToUse = cached.length > 0 ? cached : mode === "cn" ? staticCnModels : staticModels;
|
const modelsToUse = cached.length > 0 ? cached : mode === "cn" ? staticCnModels : staticModels;
|
||||||
@@ -49,7 +63,7 @@ function registerQoderProvider(pi: ExtensionAPI, mode: QoderMode): void {
|
|||||||
const oauth = createQoderOAuth(mode);
|
const oauth = createQoderOAuth(mode);
|
||||||
pi.registerProvider(providerID, {
|
pi.registerProvider(providerID, {
|
||||||
baseUrl: getQoderBaseUrl(mode),
|
baseUrl: getQoderBaseUrl(mode),
|
||||||
api: "qoder-api" as Api,
|
api: QODER_API,
|
||||||
models: modelsForProvider(mode, providerID) as unknown as ProviderConfig["models"],
|
models: modelsForProvider(mode, providerID) as unknown as ProviderConfig["models"],
|
||||||
oauth: oauth as ProviderConfig["oauth"],
|
oauth: oauth as ProviderConfig["oauth"],
|
||||||
// pi-coding-agent resolves its own nested @earendil-works/pi-ai copy, so the
|
// pi-coding-agent resolves its own nested @earendil-works/pi-ai copy, so the
|
||||||
@@ -76,6 +90,8 @@ async function refreshModelsAtStartup(mode: QoderMode): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export default async function (pi: ExtensionAPI) {
|
export default async function (pi: ExtensionAPI) {
|
||||||
|
registerQoderApi();
|
||||||
|
|
||||||
for (const mode of QODER_MODES) {
|
for (const mode of QODER_MODES) {
|
||||||
const providerID = getQoderRegionConfig(mode).providerID;
|
const providerID = getQoderRegionConfig(mode).providerID;
|
||||||
try {
|
try {
|
||||||
|
|||||||
Reference in New Issue
Block a user