@zenning/openai 2.2.0 → 2.3.0

package/dist/index.js

@@ -2438,6 +2438,11 @@ var localShellCallItem = import_v416.z.object({
     env: import_v416.z.record(import_v416.z.string(), import_v416.z.string()).optional()
   })
 });
+var sourceExecutionFileCodeInterpreterItem = import_v416.z.object({
+  containerId: import_v416.z.string(),
+  fileId: import_v416.z.string(),
+  filename: import_v416.z.string()
+});
 var imageGenerationCallItem = import_v416.z.object({
   type: import_v416.z.literal("image_generation_call"),
   id: import_v416.z.string(),
@@ -2663,7 +2668,7 @@ var OpenAIResponsesLanguageModel = class {
     };
   }
   async doGenerate(options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
     const {
       args: body,
       warnings,
@@ -2673,6 +2678,7 @@ var OpenAIResponsesLanguageModel = class {
       path: "/responses",
       modelId: this.modelId
     });
+    const providerKey = this.config.provider.replace(".responses", "");
     const {
       responseHeaders,
       value: response,
@@ -2721,7 +2727,12 @@ var OpenAIResponsesLanguageModel = class {
                           quote: import_v416.z.string().nullish()
                         }),
                         import_v416.z.object({
-                          type: import_v416.z.literal("container_file_citation")
+                          type: import_v416.z.literal("container_file_citation"),
+                          container_id: import_v416.z.string(),
+                          end_index: import_v416.z.number(),
+                          file_id: import_v416.z.string(),
+                          filename: import_v416.z.string(),
+                          start_index: import_v416.z.number()
                         })
                       ])
                     )
@@ -2843,7 +2854,8 @@ var OpenAIResponsesLanguageModel = class {
               text: contentPart.text,
               providerMetadata: {
                 openai: {
-                  itemId: part.id
+                  itemId: part.id,
+                  annotations: contentPart.annotations
                 }
               }
             });
@@ -2868,6 +2880,19 @@ var OpenAIResponsesLanguageModel = class {
                   startIndex: (_m = annotation.start_index) != null ? _m : void 0,
                   endIndex: (_n = annotation.end_index) != null ? _n : void 0
                 });
+              } else if (annotation.type === "container_file_citation") {
+                content.push({
+                  type: "source",
+                  sourceType: "executionFile",
+                  id: (_q = (_p = (_o = this.config).generateId) == null ? void 0 : _p.call(_o)) != null ? _q : (0, import_provider_utils14.generateId)(),
+                  providerMetadata: {
+                    [providerKey]: {
+                      containerId: annotation.container_id,
+                      fileId: annotation.file_id,
+                      filename: annotation.filename
+                    }
+                  }
+                });
               }
             }
           }
@@ -2939,13 +2964,13 @@ var OpenAIResponsesLanguageModel = class {
             toolName: "file_search",
             result: {
               queries: part.queries,
-              results: (_p = (_o = part.results) == null ? void 0 : _o.map((result) => ({
+              results: (_s = (_r = part.results) == null ? void 0 : _r.map((result) => ({
                 attributes: result.attributes,
                 fileId: result.file_id,
                 filename: result.filename,
                 score: result.score,
                 text: result.text
-              }))) != null ? _p : null
+              }))) != null ? _s : null
             },
             providerExecuted: true
           });
@@ -2987,15 +3012,15 @@ var OpenAIResponsesLanguageModel = class {
     return {
       content,
       finishReason: mapOpenAIResponseFinishReason({
-        finishReason: (_q = response.incomplete_details) == null ? void 0 : _q.reason,
+        finishReason: (_t = response.incomplete_details) == null ? void 0 : _t.reason,
         hasFunctionCall
       }),
       usage: {
         inputTokens: response.usage.input_tokens,
         outputTokens: response.usage.output_tokens,
         totalTokens: response.usage.input_tokens + response.usage.output_tokens,
-        reasoningTokens: (_s = (_r = response.usage.output_tokens_details) == null ? void 0 : _r.reasoning_tokens) != null ? _s : void 0,
-        cachedInputTokens: (_u = (_t = response.usage.input_tokens_details) == null ? void 0 : _t.cached_tokens) != null ? _u : void 0
+        reasoningTokens: (_v = (_u = response.usage.output_tokens_details) == null ? void 0 : _u.reasoning_tokens) != null ? _v : void 0,
+        cachedInputTokens: (_x = (_w = response.usage.input_tokens_details) == null ? void 0 : _w.cached_tokens) != null ? _x : void 0
       },
       request: { body },
       response: {
@@ -3042,6 +3067,7 @@ var OpenAIResponsesLanguageModel = class {
     const logprobs = [];
     let responseId = null;
     const ongoingToolCalls = {};
+    const ongoingAnnotations = [];
     let hasFunctionCall = false;
     const activeReasoning = {};
     let serviceTier;
@@ -3052,7 +3078,7 @@ var OpenAIResponsesLanguageModel = class {
             controller.enqueue({ type: "stream-start", warnings });
           },
           transform(chunk, controller) {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B;
             if (options.includeRawChunks) {
               controller.enqueue({ type: "raw", rawValue: chunk.rawValue });
             }
@@ -3128,6 +3154,7 @@ var OpenAIResponsesLanguageModel = class {
                   providerExecuted: true
                 });
               } else if (value.item.type === "message") {
+                ongoingAnnotations.splice(0, ongoingAnnotations.length);
                 controller.enqueue({
                   type: "text-start",
                   id: value.item.id,
@@ -3153,7 +3180,7 @@ var OpenAIResponsesLanguageModel = class {
                   }
                 });
               }
-            } else if (isResponseOutputItemDoneChunk(value)) {
+            } else if (isResponseOutputItemDoneChunk(value) && value.item.type !== "message") {
               if (value.item.type === "function_call") {
                 ongoingToolCalls[value.output_index] = void 0;
                 hasFunctionCall = true;
@@ -3274,11 +3301,6 @@ var OpenAIResponsesLanguageModel = class {
                     openai: { itemId: value.item.id }
                   }
                 });
-              } else if (value.item.type === "message") {
-                controller.enqueue({
-                  type: "text-end",
-                  id: value.item.id
-                });
               } else if (isResponseOutputItemDoneReasoningChunk(value)) {
                 const activeReasoningPart = activeReasoning[value.item.id];
                 for (const summaryIndex of activeReasoningPart.summaryParts) {
@@ -3407,6 +3429,7 @@ var OpenAIResponsesLanguageModel = class {
                 serviceTier = value.response.service_tier;
               }
             } else if (isResponseAnnotationAddedChunk(value)) {
+              ongoingAnnotations.push(value.annotation);
               if (value.annotation.type === "url_citation") {
                 controller.enqueue({
                   type: "source",
@@ -3427,7 +3450,31 @@ var OpenAIResponsesLanguageModel = class {
                   startIndex: (_x = value.annotation.start_index) != null ? _x : void 0,
                   endIndex: (_y = value.annotation.end_index) != null ? _y : void 0
                 });
+              } else if (value.annotation.type === "container_file_citation") {
+                controller.enqueue({
+                  type: "source",
+                  sourceType: "executionFile",
+                  id: (_B = (_A = (_z = self.config).generateId) == null ? void 0 : _A.call(_z)) != null ? _B : (0, import_provider_utils14.generateId)(),
+                  providerMetadata: {
+                    openai: {
+                      containerId: value.annotation.container_id,
+                      fileId: value.annotation.file_id,
+                      filename: value.annotation.filename
+                    }
+                  }
+                });
               }
+            } else if (isResponseOutputItemDoneChunk(value) && value.item.type === "message") {
+              controller.enqueue({
+                type: "text-end",
+                id: value.item.id,
+                providerMetadata: {
+                  openai: {
+                    itemId: value.item.id,
+                    annotations: ongoingAnnotations
+                  }
+                }
+              });
             } else if (isErrorChunk(value)) {
               controller.enqueue({ type: "error", error: value });
             }
@@ -3624,6 +3671,14 @@ var responseAnnotationAddedSchema = import_v416.z.object({
       start_index: import_v416.z.number().nullish(),
       end_index: import_v416.z.number().nullish(),
       quote: import_v416.z.string().nullish()
+    }),
+    import_v416.z.object({
+      type: import_v416.z.literal("container_file_citation"),
+      container_id: import_v416.z.string(),
+      end_index: import_v416.z.number(),
+      file_id: import_v416.z.string(),
+      filename: import_v416.z.string(),
+      start_index: import_v416.z.number()
     })
   ])
 });
@@ -3775,6 +3830,15 @@ var openaiResponsesProviderOptionsSchema = import_v416.z.object({
   textVerbosity: import_v416.z.enum(["low", "medium", "high"]).nullish(),
   user: import_v416.z.string().nullish()
 });
+var openaiResponsesTextUIPartProviderMetadataSchema = import_v416.z.object({
+  openai: import_v416.z.object({
+    itemId: import_v416.z.string(),
+    annotations: import_v416.z.array(responseAnnotationAddedSchema.shape.annotation)
+  })
+});
+var openaiSourceExecutionFileProviderMetadataSchema = import_v416.z.object({
+  openai: sourceExecutionFileCodeInterpreterItem
+});
 
 // src/speech/openai-speech-model.ts
 var import_provider_utils15 = require("@zenning/provider-utils");
@@ -4108,7 +4172,7 @@ var openaiTranscriptionResponseSchema = import_v419.z.object({
 });
 
 // src/version.ts
-var VERSION = true ? "2.2.0" : "0.0.0-test";
+var VERSION = true ? "2.3.0" : "0.0.0-test";
 
 // src/openai-provider.ts
 function createOpenAI(options = {}) {