@providerprotocol/ai 0.0.20 → 0.0.22

package/dist/openai/index.js

@@ -1,24 +1,30 @@
 import {
   Image
 } from "../chunk-WAKD3OO5.js";
+import {
+  parseJsonResponse
+} from "../chunk-I2VHCGQE.js";
 import {
   AssistantMessage,
+  createProvider,
+  generateId,
   isAssistantMessage,
   isToolResultMessage,
   isUserMessage
-} from "../chunk-UMKWXGO3.js";
+} from "../chunk-M4BMM5IB.js";
 import {
   parseSSEStream
-} from "../chunk-Z7RBRCRN.js";
+} from "../chunk-NWS5IKNR.js";
 import {
   resolveApiKey
-} from "../chunk-P5IRTEM5.js";
+} from "../chunk-7WYBJPJJ.js";
 import {
   UPPError,
   doFetch,
   doStreamFetch,
-  normalizeHttpError
-} from "../chunk-U3FZWV4U.js";
+  normalizeHttpError,
+  toError
+} from "../chunk-RFWLEFAB.js";
 
 // src/providers/openai/transform.completions.ts
 function transformRequest(request, modelId) {
@@ -54,9 +60,40 @@ function transformRequest(request, modelId) {
   return openaiRequest;
 }
 function normalizeSystem(system) {
-  if (!system) return void 0;
+  if (system === void 0 || system === null) return void 0;
   if (typeof system === "string") return system;
-  return system.map((block) => block.text ?? "").filter((text) => text.length > 0).join("\n\n");
+  if (!Array.isArray(system)) {
+    throw new UPPError(
+      "System prompt must be a string or an array of text blocks",
+      "INVALID_REQUEST",
+      "openai",
+      "llm"
+    );
+  }
+  const texts = [];
+  for (const block of system) {
+    if (!block || typeof block !== "object" || !("text" in block)) {
+      throw new UPPError(
+        "System prompt array must contain objects with a text field",
+        "INVALID_REQUEST",
+        "openai",
+        "llm"
+      );
+    }
+    const textValue = block.text;
+    if (typeof textValue !== "string") {
+      throw new UPPError(
+        "System prompt text must be a string",
+        "INVALID_REQUEST",
+        "openai",
+        "llm"
+      );
+    }
+    if (textValue.length > 0) {
+      texts.push(textValue);
+    }
+  }
+  return texts.length > 0 ? texts.join("\n\n") : void 0;
 }
 function transformMessages(messages, system) {
   const result = [];
@@ -224,7 +261,7 @@ function transformResponse(data) {
     textContent,
     toolCalls.length > 0 ? toolCalls : void 0,
     {
-      id: data.id,
+      id: data.id || generateId(),
       metadata: {
         openai: {
           model: data.model,
@@ -373,11 +410,12 @@ function buildResponseFromState(state) {
       arguments: args
     });
   }
+  const messageId = state.id || generateId();
   const message = new AssistantMessage(
     textContent,
     toolCalls.length > 0 ? toolCalls : void 0,
     {
-      id: state.id,
+      id: messageId,
       metadata: {
         openai: {
           model: state.model,
@@ -482,7 +520,7 @@ function createCompletionsLLMHandler() {
             "openai",
             "llm"
           );
-          const data = await response.json();
+          const data = await parseJsonResponse(response, "openai", "llm");
           return transformResponse(data);
         },
         stream(request) {
@@ -507,7 +545,8 @@ function createCompletionsLLMHandler() {
               body.stream_options = { include_usage: true };
               const headers = {
                 "Content-Type": "application/json",
-                Authorization: `Bearer ${apiKey}`
+                Authorization: `Bearer ${apiKey}`,
+                Accept: "text/event-stream"
               };
               if (request.config.headers) {
                 for (const [key, value] of Object.entries(request.config.headers)) {
@@ -568,8 +607,9 @@ function createCompletionsLLMHandler() {
               }
               responseResolve(buildResponseFromState(state));
             } catch (error) {
-              responseReject(error);
-              throw error;
+              const err = toError(error);
+              responseReject(err);
+              throw err;
             }
           }
           return {
@@ -588,15 +628,17 @@ function createCompletionsLLMHandler() {
 // src/providers/openai/transform.responses.ts
 function transformRequest2(request, modelId) {
   const params = request.params ?? {};
-  const builtInTools = params.tools;
-  const { tools: _paramsTools, ...restParams } = params;
+  const { tools: builtInTools, ...restParams } = params;
   const openaiRequest = {
     ...restParams,
     model: modelId,
     input: transformInputItems(request.messages, request.system)
   };
   const functionTools = request.tools?.map(transformTool2) ?? [];
-  const allTools = [...functionTools, ...builtInTools ?? []];
+  const allTools = [
+    ...functionTools,
+    ...builtInTools ?? []
+  ];
   if (allTools.length > 0) {
     openaiRequest.tools = allTools;
   }
@@ -623,9 +665,40 @@ function transformRequest2(request, modelId) {
   return openaiRequest;
 }
 function normalizeSystem2(system) {
-  if (!system) return void 0;
+  if (system === void 0 || system === null) return void 0;
   if (typeof system === "string") return system;
-  return system.map((block) => block.text ?? "").filter((text) => text.length > 0).join("\n\n");
+  if (!Array.isArray(system)) {
+    throw new UPPError(
+      "System prompt must be a string or an array of text blocks",
+      "INVALID_REQUEST",
+      "openai",
+      "llm"
+    );
+  }
+  const texts = [];
+  for (const block of system) {
+    if (!block || typeof block !== "object" || !("text" in block)) {
+      throw new UPPError(
+        "System prompt array must contain objects with a text field",
+        "INVALID_REQUEST",
+        "openai",
+        "llm"
+      );
+    }
+    const textValue = block.text;
+    if (typeof textValue !== "string") {
+      throw new UPPError(
+        "System prompt text must be a string",
+        "INVALID_REQUEST",
+        "openai",
+        "llm"
+      );
+    }
+    if (textValue.length > 0) {
+      texts.push(textValue);
+    }
+  }
+  return texts.length > 0 ? texts.join("\n\n") : void 0;
 }
 function transformInputItems(messages, system) {
   const result = [];
@@ -816,24 +889,26 @@ function transformResponse2(data) {
     } else if (item.type === "image_generation_call") {
       const imageGen = item;
       if (imageGen.result) {
+        const mimeType = imageGen.mime_type ?? "image/png";
         content.push({
           type: "image",
-          mimeType: "image/png",
+          mimeType,
           source: { type: "base64", data: imageGen.result }
         });
       }
     }
   }
+  const responseId = data.id || generateId();
   const message = new AssistantMessage(
     content,
     toolCalls.length > 0 ? toolCalls : void 0,
     {
-      id: data.id,
+      id: responseId,
       metadata: {
         openai: {
           model: data.model,
           status: data.status,
-          response_id: data.id,
+          response_id: responseId,
           functionCallItems: functionCallItems.length > 0 ? functionCallItems : void 0
         }
       }
@@ -872,6 +947,7 @@ function createStreamState2() {
     toolCalls: /* @__PURE__ */ new Map(),
     images: [],
     status: "in_progress",
+    incompleteReason: void 0,
     inputTokens: 0,
     outputTokens: 0,
     cacheReadTokens: 0,
@@ -880,26 +956,35 @@ function createStreamState2() {
 }
 function transformStreamEvent2(event, state) {
   const events = [];
+  const updateFromResponse = (response) => {
+    state.id = response.id || state.id;
+    state.model = response.model || state.model;
+    state.status = response.status;
+    if (response.incomplete_details?.reason) {
+      state.incompleteReason = response.incomplete_details.reason;
+    } else if (response.status !== "incomplete") {
+      state.incompleteReason = void 0;
+    }
+    if (response.usage) {
+      state.inputTokens = response.usage.input_tokens;
+      state.outputTokens = response.usage.output_tokens;
+      state.cacheReadTokens = response.usage.input_tokens_details?.cached_tokens ?? 0;
+    }
+  };
   switch (event.type) {
     case "response.created":
-      state.id = event.response.id;
-      state.model = event.response.model;
+      updateFromResponse(event.response);
       events.push({ type: "message_start", index: 0, delta: {} });
       break;
     case "response.in_progress":
-      state.status = "in_progress";
+      updateFromResponse(event.response);
       break;
     case "response.completed":
-      state.status = "completed";
-      if (event.response.usage) {
-        state.inputTokens = event.response.usage.input_tokens;
-        state.outputTokens = event.response.usage.output_tokens;
-        state.cacheReadTokens = event.response.usage.input_tokens_details?.cached_tokens ?? 0;
-      }
+      updateFromResponse(event.response);
       events.push({ type: "message_stop", index: 0, delta: {} });
       break;
     case "response.failed":
-      state.status = "failed";
+      updateFromResponse(event.response);
       events.push({ type: "message_stop", index: 0, delta: {} });
       break;
     case "response.output_item.added":
@@ -938,7 +1023,10 @@ function transformStreamEvent2(event, state) {
       } else if (event.item.type === "image_generation_call") {
         const imageGen = event.item;
         if (imageGen.result) {
-          state.images.push(imageGen.result);
+          state.images.push({
+            data: imageGen.result,
+            mimeType: imageGen.mime_type ?? "image/png"
+          });
         }
       }
       events.push({
@@ -1025,7 +1113,10 @@ function transformStreamEvent2(event, state) {
 function buildResponseFromState2(state) {
   const content = [];
   let structuredData;
-  for (const [, text] of state.textByIndex) {
+  const orderedTextEntries = [...state.textByIndex.entries()].sort(
+    ([leftIndex], [rightIndex]) => leftIndex - rightIndex
+  );
+  for (const [, text] of orderedTextEntries) {
     if (text) {
       content.push({ type: "text", text });
       if (structuredData === void 0) {
@@ -1039,13 +1130,16 @@ function buildResponseFromState2(state) {
   for (const imageData of state.images) {
     content.push({
       type: "image",
-      mimeType: "image/png",
-      source: { type: "base64", data: imageData }
+      mimeType: imageData.mimeType,
+      source: { type: "base64", data: imageData.data }
     });
   }
   const toolCalls = [];
   const functionCallItems = [];
-  for (const [, toolCall] of state.toolCalls) {
+  const orderedToolEntries = [...state.toolCalls.entries()].sort(
+    ([leftIndex], [rightIndex]) => leftIndex - rightIndex
+  );
+  for (const [, toolCall] of orderedToolEntries) {
     let args = {};
     if (toolCall.arguments) {
       try {
@@ -1056,6 +1150,9 @@ function buildResponseFromState2(state) {
     const itemId = toolCall.itemId ?? "";
     const callId = toolCall.callId ?? toolCall.itemId ?? "";
     const name = toolCall.name ?? "";
+    if (!name || !callId) {
+      continue;
+    }
     toolCalls.push({
       toolCallId: callId,
       toolName: name,
@@ -1070,16 +1167,17 @@ function buildResponseFromState2(state) {
       });
     }
   }
+  const responseId = state.id || generateId();
   const message = new AssistantMessage(
     content,
     toolCalls.length > 0 ? toolCalls : void 0,
     {
-      id: state.id,
+      id: responseId,
       metadata: {
         openai: {
           model: state.model,
           status: state.status,
-          response_id: state.id,
+          response_id: responseId,
           functionCallItems: functionCallItems.length > 0 ? functionCallItems : void 0
         }
       }
@@ -1095,6 +1193,8 @@ function buildResponseFromState2(state) {
   let stopReason = "end_turn";
   if (state.status === "completed") {
     stopReason = toolCalls.length > 0 ? "tool_use" : "end_turn";
+  } else if (state.status === "incomplete") {
+    stopReason = state.incompleteReason === "max_output_tokens" ? "max_tokens" : "end_turn";
   } else if (state.status === "failed") {
     stopReason = "error";
   }
@@ -1172,7 +1272,7 @@ function createResponsesLLMHandler() {
             "openai",
             "llm"
           );
-          const data = await response.json();
+          const data = await parseJsonResponse(response, "openai", "llm");
           if (data.status === "failed" && data.error) {
             throw new UPPError(
               data.error.message,
@@ -1204,7 +1304,8 @@ function createResponsesLLMHandler() {
               body.stream = true;
               const headers = {
                 "Content-Type": "application/json",
-                Authorization: `Bearer ${apiKey}`
+                Authorization: `Bearer ${apiKey}`,
+                Accept: "text/event-stream"
               };
               if (request.config.headers) {
                 for (const [key, value] of Object.entries(request.config.headers)) {
@@ -1265,8 +1366,9 @@ function createResponsesLLMHandler() {
               }
               responseResolve(buildResponseFromState2(state));
             } catch (error) {
-              responseReject(error);
-              throw error;
+              const err = toError(error);
+              responseReject(err);
+              throw err;
             }
           }
           return {
@@ -1340,18 +1442,10 @@ function createEmbeddingHandler() {
             );
           });
           const body = {
+            ...request.params,
             model: modelId,
             input: inputTexts
           };
-          if (request.params?.dimensions !== void 0) {
-            body.dimensions = request.params.dimensions;
-          }
-          if (request.params?.encoding_format !== void 0) {
-            body.encoding_format = request.params.encoding_format;
-          }
-          if (request.params?.user !== void 0) {
-            body.user = request.params.user;
-          }
           const headers = {
             "Content-Type": "application/json",
             Authorization: `Bearer ${apiKey}`
@@ -1369,7 +1463,7 @@ function createEmbeddingHandler() {
             body: JSON.stringify(body),
             signal: request.signal
           }, request.config, "openai", "embedding");
-          const data = await response.json();
+          const data = await parseJsonResponse(response, "openai", "embedding");
           return {
             embeddings: data.data.map((d) => ({
               vector: d.embedding,
@@ -1444,22 +1538,10 @@ async function executeGenerate(modelId, request) {
   );
   const baseUrl = request.config.baseUrl ? `${request.config.baseUrl.replace(/\/$/, "")}/v1/images/generations` : OPENAI_IMAGES_API_URL;
   const body = {
+    ...request.params,
     model: modelId,
     prompt: request.prompt
   };
-  if (request.params) {
-    const { n, size, quality, style, background, output_format, output_compression, response_format, moderation, user } = request.params;
-    if (n !== void 0) body.n = n;
-    if (size !== void 0) body.size = size;
-    if (quality !== void 0) body.quality = quality;
-    if (style !== void 0) body.style = style;
-    if (background !== void 0) body.background = background;
-    if (output_format !== void 0) body.output_format = output_format;
-    if (output_compression !== void 0) body.output_compression = output_compression;
-    if (response_format !== void 0) body.response_format = response_format;
-    if (moderation !== void 0) body.moderation = moderation;
-    if (user !== void 0) body.user = user;
-  }
   const headers = {
     "Content-Type": "application/json",
     Authorization: `Bearer ${apiKey}`
@@ -1477,7 +1559,7 @@ async function executeGenerate(modelId, request) {
     body: JSON.stringify(body),
     signal: request.signal
   }, request.config, "openai", "image");
-  const data = await response.json();
+  const data = await parseJsonResponse(response, "openai", "image");
   return transformResponse3(data);
 }
 async function executeEdit(modelId, request) {
@@ -1522,7 +1604,7 @@ async function executeEdit(modelId, request) {
     body: formData,
     signal: request.signal
   }, request.config, "openai", "image");
-  const data = await response.json();
+  const data = await parseJsonResponse(response, "openai", "image");
   return transformResponse3(data);
 }
 function executeStream(modelId, request) {
@@ -1543,21 +1625,11 @@ function executeStream(modelId, request) {
       );
       const baseUrl = request.config.baseUrl ? `${request.config.baseUrl.replace(/\/$/, "")}/v1/images/generations` : OPENAI_IMAGES_API_URL;
       const body = {
+        ...request.params,
         model: modelId,
         prompt: request.prompt,
         stream: true
       };
-      if (request.params) {
-        const { n, size, quality, background, output_format, partial_images, moderation, user } = request.params;
-        if (n !== void 0) body.n = n;
-        if (size !== void 0) body.size = size;
-        if (quality !== void 0) body.quality = quality;
-        if (background !== void 0) body.background = background;
-        if (output_format !== void 0) body.output_format = output_format;
-        if (partial_images !== void 0) body.partial_images = partial_images;
-        if (moderation !== void 0) body.moderation = moderation;
-        if (user !== void 0) body.user = user;
-      }
       const headers = {
         "Content-Type": "application/json",
         Authorization: `Bearer ${apiKey}`,
@@ -1631,6 +1703,46 @@ function executeStream(modelId, request) {
           }
         }
       }
+      const remaining = decoder.decode();
+      if (remaining) {
+        buffer += remaining;
+        const lines = buffer.split("\n");
+        buffer = lines.pop() ?? "";
+        for (const line of lines) {
+          if (line.startsWith("data: ")) {
+            const data = line.slice(6);
+            if (data === "[DONE]") {
+              continue;
+            }
+            try {
+              const chunk = JSON.parse(data);
+              if (chunk.type === "image_generation.partial_image" && chunk.data?.b64_json) {
+                const previewImage = Image.fromBase64(chunk.data.b64_json, "image/png");
+                yield {
+                  type: "preview",
+                  image: previewImage,
+                  index: chunk.index ?? 0
+                };
+              } else if (chunk.type === "image_generation.completed" && chunk.data) {
+                const image = chunk.data.b64_json ? Image.fromBase64(chunk.data.b64_json, "image/png") : Image.fromUrl(chunk.data.url ?? "", "image/png");
+                const genImage = {
+                  image,
+                  metadata: chunk.data.revised_prompt ? { revised_prompt: chunk.data.revised_prompt } : void 0
+                };
+                generatedImages.push(genImage);
+                yield {
+                  type: "complete",
+                  image: genImage,
+                  index: chunk.index ?? generatedImages.length - 1
+                };
+              } else if (chunk.type === "response.done") {
+                responseMetadata = chunk.data;
+              }
+            } catch {
+            }
+          }
+        }
+      }
       resolveResponse({
         images: generatedImages,
         metadata: responseMetadata,
@@ -1639,8 +1751,9 @@ function executeStream(modelId, request) {
         }
       });
     } catch (error) {
-      rejectResponse(error);
-      throw error;
+      const err = toError(error);
+      rejectResponse(err);
+      throw err;
     }
   }
   const generator = generateStream();
@@ -1749,49 +1862,22 @@ var tools = {
 };
 
 // src/providers/openai/index.ts
-function createOpenAIProvider() {
-  let currentApiMode = "responses";
-  const responsesHandler = createResponsesLLMHandler();
-  const completionsHandler = createCompletionsLLMHandler();
-  const embeddingHandler = createEmbeddingHandler();
-  const imageHandler = createImageHandler();
-  const fn = function(modelId, options) {
-    const apiMode = options?.api ?? "responses";
-    currentApiMode = apiMode;
-    return { modelId, provider };
-  };
-  const modalities = {
-    get llm() {
-      return currentApiMode === "completions" ? completionsHandler : responsesHandler;
-    },
-    embedding: embeddingHandler,
-    image: imageHandler
-  };
-  Object.defineProperties(fn, {
-    name: {
-      value: "openai",
-      writable: false,
-      configurable: true
-    },
-    version: {
-      value: "1.0.0",
-      writable: false,
-      configurable: true
+var openai = createProvider({
+  name: "openai",
+  version: "1.0.0",
+  handlers: {
+    llm: {
+      handlers: {
+        responses: createResponsesLLMHandler(),
+        completions: createCompletionsLLMHandler()
+      },
+      defaultMode: "responses",
+      getMode: (options) => options?.api ?? "responses"
     },
-    modalities: {
-      value: modalities,
-      writable: false,
-      configurable: true
-    }
-  });
-  const provider = fn;
-  responsesHandler._setProvider?.(provider);
-  completionsHandler._setProvider?.(provider);
-  embeddingHandler._setProvider?.(provider);
-  imageHandler._setProvider?.(provider);
-  return provider;
-}
-var openai = createOpenAIProvider();
+    embedding: createEmbeddingHandler(),
+    image: createImageHandler()
+  }
+});
 export {
   codeInterpreterTool,
   computerTool,