Skip to content

Star and rename aimlapi user-facing labels to aimlapi.com #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lookoff-AIMLAPI merged 1 commit into from
Aug 25, 2026
Merged

Star and rename aimlapi user-facing labels to aimlapi.com #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions packages/ai/src/auth/oauth/aimlapi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ async function request(
const onAbort = () => controller.abort(options.signal.reason);
options.signal.addEventListener("abort", onAbort, { once: true });
const timeout = setTimeout(
() => controller.abort(new Error(`AI/ML API request to ${url} timed out`)),
() => controller.abort(new Error(`aimlapi.com request to ${url} timed out`)),
REQUEST_TIMEOUT_MS,
);

Expand All @@ -56,7 +56,7 @@ async function request(
});
} catch (error) {
if (options.signal.aborted) throw new Error("Login cancelled");
if (controller.signal.aborted) throw new Error(`AI/ML API request to ${url} timed out`);
if (controller.signal.aborted) throw new Error(`aimlapi.com request to ${url} timed out`);
throw error;
} finally {
clearTimeout(timeout);
Expand All @@ -66,7 +66,7 @@ async function request(
const label = `${method} ${url}`;

if (options.expectJson === false) {
if (!response.ok) throw new Error(`AI/ML API request failed: ${label} -> HTTP ${response.status}`);
if (!response.ok) throw new Error(`aimlapi.com request failed: ${label} -> HTTP ${response.status}`);
return undefined;
}

Expand All @@ -75,12 +75,12 @@ async function request(
const parsed = (await response.json()) as unknown;
if (isRecord(parsed)) body = parsed;
} catch {
if (response.ok) throw new Error(`AI/ML API returned invalid JSON: ${label}`);
if (response.ok) throw new Error(`aimlapi.com returned invalid JSON: ${label}`);
}

if (!response.ok) {
const detail = errorDetail(body);
throw new Error(`AI/ML API request failed: ${label} -> HTTP ${response.status}${detail ? `: ${detail}` : ""}`);
throw new Error(`aimlapi.com request failed: ${label} -> HTTP ${response.status}${detail ? `: ${detail}` : ""}`);
}
return body;
}
Expand All @@ -91,7 +91,8 @@ async function checkAccount(
): Promise<{ action: "sign-in" | "sign-up"; provider?: string }> {
const body = await request("PATCH", `${AUTH_BASE_URL}/v1/auth/account`, { body: { email }, signal });
const action = body?.action;
if (action !== "sign-in" && action !== "sign-up") throw new Error("AI/ML API returned an invalid account response");
if (action !== "sign-in" && action !== "sign-up")
throw new Error("aimlapi.com returned an invalid account response");
return { action, provider: typeof body?.provider === "string" ? body.provider : undefined };
}

Expand All @@ -102,30 +103,30 @@ async function sendSignInCode(email: string, signal: AbortSignal): Promise<void>
async function exchangeForToken(path: string, body: JsonObject, signal: AbortSignal): Promise<string> {
const result = await request("POST", `${AUTH_BASE_URL}${path}`, { body, signal });
const token = result?.token;
if (typeof token !== "string" || token.length === 0) throw new Error("AI/ML API did not return an auth token");
if (typeof token !== "string" || token.length === 0) throw new Error("aimlapi.com did not return an auth token");
return token;
}

async function createKey(bearer: string, signal: AbortSignal): Promise<string> {
const result = await request("POST", `${APP_BASE_URL}/v1/keys`, { body: { name: KEY_NAME }, bearer, signal });
const key = result?.key;
if (typeof key !== "string" || key.length === 0) throw new Error("AI/ML API did not return an API key");
if (typeof key !== "string" || key.length === 0) throw new Error("aimlapi.com did not return an API key");
return key;
}

async function loginAimlapi(interaction: ProviderAuthInteraction): Promise<OAuthCredential> {
const rawEmail = await interaction.prompt({ type: "text", message: "Enter your AI/ML API account email" });
const rawEmail = await interaction.prompt({ type: "text", message: "Enter your aimlapi.com account email" });
const email = rawEmail.trim();
if (!email) throw new Error("Email is required");

interaction.notify({ type: "progress", message: "Checking your AI/ML API account..." });
interaction.notify({ type: "progress", message: "Checking your aimlapi.com account..." });
const account = await checkAccount(email, interaction.signal);

if (account.action === "sign-up") {
// A freshly created passwordless account is inactive until its first top-up
// (AI/ML API mints API keys only for active accounts), so there is no key to
// hand back here yet — create the account and send the user to fund it.
interaction.notify({ type: "progress", message: "Creating your AI/ML API account..." });
interaction.notify({ type: "progress", message: "Creating your aimlapi.com account..." });
await exchangeForToken("/v1/auth/account/passwordless", { email }, interaction.signal);
throw new Error(
`Account created for ${email}. Add credit at https://aimlapi.com/app, then run /login again to sign in.`,
Expand All @@ -142,7 +143,7 @@ async function loginAimlapi(interaction: ProviderAuthInteraction): Promise<OAuth
if (!code) throw new Error("Code is required");
const sessionToken = await exchangeForToken("/v1/auth/sign-in/code/verify", { email, code }, interaction.signal);

interaction.notify({ type: "progress", message: "Creating an AI/ML API key for pi..." });
interaction.notify({ type: "progress", message: "Creating an aimlapi.com key for pi..." });
const key = await createKey(sessionToken, interaction.signal);

return {
Expand All @@ -154,8 +155,8 @@ async function loginAimlapi(interaction: ProviderAuthInteraction): Promise<OAuth
}

export const aimlapiOAuth: OAuthAuth = {
name: "AI/ML API sign-in",
loginLabel: "Sign in with AI/ML API",
name: "aimlapi.com sign-in",
loginLabel: "Sign in with aimlapi.com",
login: loginAimlapi,
async refresh(credential, _signal) {
return credential;
Expand Down
8 changes: 4 additions & 4 deletions packages/ai/src/providers/aimlapi.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ import { AIMLAPI_MODELS } from "./aimlapi.models.ts";
export function aimlapiProvider(): Provider<"openai-completions"> {
return createProvider({
id: "aimlapi",
name: "aimlapi.com",
name: "★ aimlapi.com",
baseUrl: "https://api.aimlapi.com/v1",
auth: {
apiKey: envApiKeyAuth("AI/ML API key", ["AIMLAPI_API_KEY"]),
apiKey: envApiKeyAuth("aimlapi.com key", ["AIMLAPI_API_KEY"]),
oauth: lazyOAuth({
name: "AI/ML API sign-in",
loginLabel: "Sign in with AI/ML API",
name: "aimlapi.com sign-in",
loginLabel: "Sign in with aimlapi.com",
load: loadAimlapiOAuth,
}),
},
Expand Down
6 changes: 3 additions & 3 deletions packages/ai/test/aimlapi-oauth.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe.sequential("AI/ML API OAuth", () => {
const provider = aimlapiProvider();
expect(provider.auth.apiKey).toBeDefined();
expect(provider.auth.oauth).toBeDefined();
expect(provider.auth.oauth?.loginLabel).toBe("Sign in with AI/ML API");
expect(provider.auth.oauth?.loginLabel).toBe("Sign in with aimlapi.com");
});

it("signs in an existing account with an emailed code and mints an API key", async () => {
Expand Down Expand Up @@ -136,7 +136,7 @@ describe.sequential("AI/ML API OAuth", () => {
prompt: async () => prompts.shift() ?? "",
notify: () => {},
}),
).rejects.toThrow(`AI/ML API request failed: POST ${VERIFY_CODE_URL} -> HTTP 400: invalid code`);
).rejects.toThrow(`aimlapi.com request failed: POST ${VERIFY_CODE_URL} -> HTTP 400: invalid code`);
});

it("rejects a successful key response that carries no key", async () => {
Expand All @@ -159,7 +159,7 @@ describe.sequential("AI/ML API OAuth", () => {
prompt: async () => prompts.shift() ?? "",
notify: () => {},
}),
).rejects.toThrow("AI/ML API did not return an API key");
).rejects.toThrow("aimlapi.com did not return an API key");
});

it("rejects an empty email without making a request", async () => {
Expand Down
Loading