Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions extensions/cli/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export function createLlmApi(
}
: {
provider: model.provider as any,
model: model.model,
apiKey: model.apiKey,
apiBase: model.apiBase,
requestOptions: model.requestOptions,
Expand Down
303 changes: 303 additions & 0 deletions packages/openai-adapters/src/apis/AiSdk.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,303 @@
import { createOpenAI } from "@ai-sdk/openai";
import {
ChatCompletion,
ChatCompletionChunk,
ChatCompletionCreateParamsNonStreaming,
ChatCompletionCreateParamsStreaming,
Completion,
CompletionCreateParamsNonStreaming,
CompletionCreateParamsStreaming,
CreateEmbeddingResponse,
EmbeddingCreateParams,
Model,
} from "openai/resources/index";
import { AiSdkConfig } from "../types.js";
import { customFetch, embedding } from "../util.js";
import {
BaseLlmApi,
CreateRerankResponse,
FimCreateParamsStreaming,
RerankCreateParams,
} from "./base.js";

type AiSdkProviderCreator = (options: {
apiKey?: string;
baseURL?: string;
fetch?: typeof fetch;
}) => (modelId: string) => any;

const PROVIDER_MAP: Record<string, AiSdkProviderCreator> = {
openai: createOpenAI,
anthropic: (options) =>
createOpenAI({
...options,
baseURL: options.baseURL ?? "https://api.anthropic.com/v1/",
}),
openrouter: (options) =>
createOpenAI({
...options,
baseURL: options.baseURL ?? "https://openrouter.ai/api/v1/",
}),
};

export class AiSdkApi implements BaseLlmApi {
private provider?: (modelId: string) => any;
private config: AiSdkConfig;
private providerId: string;
private modelId: string;

constructor(config: AiSdkConfig) {
this.config = config;
if (!config.model) {
throw new Error(
"AI SDK provider requires a model in the format '<provider>/<model>' (e.g., 'openai/gpt-4o')",
);
}
const [providerId, ...modelParts] = config.model.split("/");
this.providerId = providerId;
this.modelId = modelParts.join("/");
}

private initializeProvider() {
if (this.provider) {
return;
}

const createFn = PROVIDER_MAP[this.providerId];
if (!createFn) {
const supportedProviders = Object.keys(PROVIDER_MAP).join(", ");
throw new Error(
`Unknown AI SDK provider: "${this.providerId}". ` +
`Supported providers: ${supportedProviders}. ` +
`To use a different provider, install the @ai-sdk/* package and add it to the provider map.`,
);
}

const hasRequestOptions =
this.config.requestOptions &&
(this.config.requestOptions.headers ||
this.config.requestOptions.proxy ||
this.config.requestOptions.caBundlePath ||
this.config.requestOptions.clientCertificate ||
this.config.requestOptions.extraBodyProperties);

this.provider = createFn({
apiKey: this.config.apiKey ?? "",
baseURL: this.config.apiBase,
fetch: hasRequestOptions
? customFetch(this.config.requestOptions)
: undefined,
});
}

async chatCompletionNonStream(
body: ChatCompletionCreateParamsNonStreaming,
signal: AbortSignal,
): Promise<ChatCompletion> {
this.initializeProvider();

const { generateText } = await import("ai");
const { convertOpenAIMessagesToVercel } = await import(
"../openaiToVercelMessages.js"
);
const { convertToolsToVercelFormat } = await import(
"../convertToolsToVercel.js"
);
const { convertToolChoiceToVercel } = await import(
"../convertToolChoiceToVercel.js"
);

const vercelMessages = convertOpenAIMessagesToVercel(body.messages);
const systemMsg = vercelMessages.find((msg) => msg.role === "system");
const systemText =
systemMsg && typeof systemMsg.content === "string"
? systemMsg.content
: undefined;
const nonSystemMessages = vercelMessages.filter(
(msg) => msg.role !== "system",
);

const modelId = this.modelId ?? body.model;
const model = this.provider!(modelId);
const vercelTools = await convertToolsToVercelFormat(body.tools);

const result = await generateText({
model,
system: systemText,
messages: nonSystemMessages as any,
temperature: body.temperature ?? undefined,
maxTokens: body.max_tokens ?? undefined,
topP: body.top_p ?? undefined,
stopSequences: body.stop
? Array.isArray(body.stop)
? body.stop
: [body.stop]
: undefined,
tools: vercelTools,
toolChoice: convertToolChoiceToVercel(body.tool_choice),
abortSignal: signal,
});

const toolCalls = result.toolCalls?.map((tc) => ({
id: tc.toolCallId,
type: "function" as const,
function: {
name: tc.toolName,
arguments: JSON.stringify(tc.args),
},
}));

return {
id: result.response?.id ?? "",
object: "chat.completion",
created: Math.floor(Date.now() / 1000),
model: modelId,
choices: [
{
index: 0,
message: {
role: "assistant",
content: result.text,
tool_calls: toolCalls,
refusal: null,
},
finish_reason:
result.finishReason === "tool-calls" ? "tool_calls" : "stop",
Copy link
Contributor

@cubic-dev-ai cubic-dev-ai bot Feb 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2: finish_reason mapping collapses "length" and "content-filter" into "stop", hiding truncation or content-filter events from OpenAI-style clients.

Prompt for AI agents
Check if this issue is valid — if so, understand the root cause and fix it. At packages/openai-adapters/src/apis/AiSdk.ts, line 165:

<comment>finish_reason mapping collapses "length" and "content-filter" into "stop", hiding truncation or content-filter events from OpenAI-style clients.</comment>

<file context>
@@ -0,0 +1,303 @@
+            refusal: null,
+          },
+          finish_reason:
+            result.finishReason === "tool-calls" ? "tool_calls" : "stop",
+          logprobs: null,
+        },
</file context>
Fix with Cubic

logprobs: null,
},
],
usage: {
prompt_tokens: result.usage.promptTokens,
completion_tokens: result.usage.completionTokens,
total_tokens: result.usage.totalTokens,
},
};
}

async *chatCompletionStream(
body: ChatCompletionCreateParamsStreaming,
signal: AbortSignal,
): AsyncGenerator<ChatCompletionChunk> {
this.initializeProvider();

const { streamText } = await import("ai");
const { convertOpenAIMessagesToVercel } = await import(
"../openaiToVercelMessages.js"
);
const { convertToolsToVercelFormat } = await import(
"../convertToolsToVercel.js"
);
const { convertVercelStream } = await import("../vercelStreamConverter.js");
const { convertToolChoiceToVercel } = await import(
"../convertToolChoiceToVercel.js"
);

const vercelMessages = convertOpenAIMessagesToVercel(body.messages);
const systemMsg = vercelMessages.find((msg) => msg.role === "system");
const systemText =
systemMsg && typeof systemMsg.content === "string"
? systemMsg.content
: undefined;
const nonSystemMessages = vercelMessages.filter(
(msg) => msg.role !== "system",
);

const modelId = this.modelId ?? body.model;
const model = this.provider!(modelId);
const vercelTools = await convertToolsToVercelFormat(body.tools);

const result = streamText({
model,
system: systemText,
messages: nonSystemMessages as any,
temperature: body.temperature ?? undefined,
maxTokens: body.max_tokens ?? undefined,
topP: body.top_p ?? undefined,
stopSequences: body.stop
? Array.isArray(body.stop)
? body.stop
: [body.stop]
: undefined,
tools: vercelTools,
toolChoice: convertToolChoiceToVercel(body.tool_choice),
abortSignal: signal,
});

yield* convertVercelStream(result.fullStream as any, { model: modelId });
}

async completionNonStream(
_body: CompletionCreateParamsNonStreaming,
_signal: AbortSignal,
): Promise<Completion> {
throw new Error(
"AI SDK provider does not support legacy completions API. Use chat completions instead.",
);
}

async *completionStream(
_body: CompletionCreateParamsStreaming,
_signal: AbortSignal,
): AsyncGenerator<Completion> {
throw new Error(
"AI SDK provider does not support legacy completions API. Use chat completions instead.",
);
}

async *fimStream(
_body: FimCreateParamsStreaming,
_signal: AbortSignal,
): AsyncGenerator<ChatCompletionChunk> {
throw new Error(
"AI SDK provider does not support fill-in-the-middle (FIM) completions.",
);
}

async embed(body: EmbeddingCreateParams): Promise<CreateEmbeddingResponse> {
this.initializeProvider();

const { embed: aiEmbed, embedMany } = await import("ai");

const modelId = typeof body.model === "string" ? body.model : body.model;
const model = this.provider!(modelId);

const inputs = Array.isArray(body.input) ? body.input : [body.input];

if (inputs.length === 1) {
const result = await aiEmbed({
model,
value: inputs[0],
});
return embedding({
data: [result.embedding],
model: modelId,
usage: {
prompt_tokens: result.usage?.tokens ?? 0,
total_tokens: result.usage?.tokens ?? 0,
},
});
}

const result = await embedMany({
model,
values: inputs as string[],
});

return embedding({
data: result.embeddings,
model: modelId,
usage: {
prompt_tokens: result.usage?.tokens ?? 0,
total_tokens: result.usage?.tokens ?? 0,
},
});
}

async rerank(_body: RerankCreateParams): Promise<CreateRerankResponse> {
throw new Error("AI SDK provider does not support reranking.");
}

async list(): Promise<Model[]> {
return [];
}
}
54 changes: 51 additions & 3 deletions packages/openai-adapters/src/convertToolsToVercel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,53 @@

import type { ChatCompletionCreateParams } from "openai/resources/index.js";

/**
* Recursively transforms schemas to be OpenAI strict mode compatible:
* - Adds additionalProperties: false to all object schemas
* - Ensures all properties are listed in the required array
*/
function makeOpenAIStrictCompatible(schema: any): any {
if (!schema || typeof schema !== "object") {
return schema;
}

const result = { ...schema };

if (result.type === "object") {
result.additionalProperties = false;

if (result.properties) {
const propertyKeys = Object.keys(result.properties);
result.required = propertyKeys;

result.properties = Object.fromEntries(
Object.entries(result.properties).map(([key, value]) => [
key,
makeOpenAIStrictCompatible(value),
]),
);
}
}

if (result.items) {
result.items = makeOpenAIStrictCompatible(result.items);
}

if (result.anyOf) {
result.anyOf = result.anyOf.map(makeOpenAIStrictCompatible);
}

if (result.oneOf) {
result.oneOf = result.oneOf.map(makeOpenAIStrictCompatible);
}

if (result.allOf) {
result.allOf = result.allOf.map(makeOpenAIStrictCompatible);
}

return result;
}

/**
* Converts OpenAI tool format to Vercel AI SDK format.
*
Expand All @@ -25,11 +72,12 @@ export async function convertToolsToVercelFormat(
const vercelTools: Record<string, any> = {};
for (const tool of openaiTools) {
if (tool.type === "function") {
const parameters = makeOpenAIStrictCompatible(
tool.function.parameters ?? { type: "object", properties: {} },
);
vercelTools[tool.function.name] = {
description: tool.function.description,
parameters: aiJsonSchema(
tool.function.parameters ?? { type: "object", properties: {} },
),
parameters: aiJsonSchema(parameters),
};
}
}
Expand Down
Loading
Loading