@openai/agents-openai 0.13.1 → 0.13.2

package/dist/openaiResponsesModel.js

@@ -1089,6 +1089,9 @@ function getInputMessageContent(entry) {
         return {
             type: 'input_text',
             text: entry.text,
+            ...(entry.promptCacheBreakpoint
+                ? { prompt_cache_breakpoint: entry.promptCacheBreakpoint }
+                : {}),
             ...(0, providerData_1.getSnakeCasedProviderDataWithoutReservedKeys)(entry.providerData, [
                 'type',
                 'text',
@@ -1114,6 +1117,9 @@ function getInputMessageContent(entry) {
         }
         return {
             ...imageEntry,
+            ...(entry.promptCacheBreakpoint
+                ? { prompt_cache_breakpoint: entry.promptCacheBreakpoint }
+                : {}),
             ...(0, providerData_1.getSnakeCasedProviderDataWithoutReservedKeys)(entry.providerData, [
                 'type',
                 'detail',
@@ -1168,6 +1174,9 @@ function getInputMessageContent(entry) {
         }
         return {
             ...fileEntry,
+            ...(entry.promptCacheBreakpoint
+                ? { prompt_cache_breakpoint: entry.promptCacheBreakpoint }
+                : {}),
             ...(0, providerData_1.getSnakeCasedProviderDataWithoutReservedKeys)(entry.providerData, [
                 'type',
                 'file_data',
@@ -2074,6 +2083,66 @@ class OpenAIResponsesModel {
     getRetryAdvice(args) {
         return (0, retryAdvice_1.getOpenAIRetryAdvice)(args);
     }
+    /**
+     * @internal
+     */
+    _convertResponseOutputItems(items) {
+        return convertToOutputItem(items);
+    }
+    /**
+     * @internal
+     */
+    _getResponseForSDKOutput(response) {
+        return response;
+    }
+    /**
+     * @internal
+     */
+    _shouldEmitOutputTextDelta(_event, _outputItem) {
+        return true;
+    }
+    /**
+     * @internal
+     */
+    _shouldEmitRawModelEvent(_event) {
+        return true;
+    }
+    /**
+     * @internal
+     */
+    _getResponsesCreateRequestOverrides(_request, _requestData) {
+        return {};
+    }
+    /**
+     * @internal
+     */
+    _getResponseUsage(response) {
+        return new agents_core_1.Usage({
+            inputTokens: response.usage?.input_tokens ?? 0,
+            outputTokens: response.usage?.output_tokens ?? 0,
+            totalTokens: response.usage?.total_tokens ?? 0,
+            inputTokensDetails: { ...response.usage?.input_tokens_details },
+            outputTokensDetails: { ...response.usage?.output_tokens_details },
+            requestUsageEntries: [
+                (0, responsesUtils_1.toRequestUsageEntry)(response.usage, 'responses.create'),
+            ],
+        });
+    }
+    /**
+     * @internal
+     */
+    _getStreamedResponseUsage(response) {
+        return {
+            inputTokens: response.usage?.input_tokens ?? 0,
+            outputTokens: response.usage?.output_tokens ?? 0,
+            totalTokens: response.usage?.total_tokens ?? 0,
+            inputTokensDetails: { ...response.usage?.input_tokens_details },
+            outputTokensDetails: { ...response.usage?.output_tokens_details },
+            requestUsageEntries: [
+                (0, responsesUtils_1.toRequestUsageEntry)(response.usage, 'responses.create'),
+            ],
+        };
+    }
     async _fetchResponse(request, stream) {
         const builtRequest = this._buildResponsesCreateRequest(request, stream);
         const requestOptions = {
@@ -2187,6 +2256,7 @@ class OpenAIResponsesModel {
             text: responseFormat,
             store: request.modelSettings.store,
             prompt_cache_retention: (0, modelSettings_1.normalizePromptCacheRetention)(request.modelSettings.promptCacheRetention),
+            prompt_cache_options: request.modelSettings.promptCacheOptions,
             context_management: getContextManagement(request.modelSettings.contextManagement),
             ...restOfProviderData,
         };
@@ -2196,6 +2266,10 @@ class OpenAIResponsesModel {
                 ...transportOverrides.extraBody,
             };
         }
+        requestData = {
+            ...requestData,
+            ...this._getResponsesCreateRequestOverrides(request, requestData),
+        };
         // Keep the transport mode aligned with the calling path even if extra_body includes stream.
         requestData.stream = stream;
         const requestHeaderAccumulator = (0, responsesTransportUtils_1.createHeaderAccumulator)();
@@ -2234,18 +2308,10 @@ class OpenAIResponsesModel {
             }
             return response;
         });
+        const responseForSDKOutput = this._getResponseForSDKOutput(response);
         const output = {
-            usage: new agents_core_1.Usage({
-                inputTokens: response.usage?.input_tokens ?? 0,
-                outputTokens: response.usage?.output_tokens ?? 0,
-                totalTokens: response.usage?.total_tokens ?? 0,
-                inputTokensDetails: { ...response.usage?.input_tokens_details },
-                outputTokensDetails: { ...response.usage?.output_tokens_details },
-                requestUsageEntries: [
-                    (0, responsesUtils_1.toRequestUsageEntry)(response.usage, 'responses.create'),
-                ],
-            }),
-            output: convertToOutputItem(response.output),
+            usage: this._getResponseUsage(response),
+            output: this._convertResponseOutputItems(responseForSDKOutput.output),
             responseId: response.id,
             requestId: getOpenAIResponseRequestId(response),
             providerData: response,
@@ -2269,8 +2335,17 @@ class OpenAIResponsesModel {
             }
             const response = await this._fetchResponse(request, true);
             let finalResponse;
+            const outputItemsByIndex = new Map();
             for await (const event of response) {
                 const eventType = event.type;
+                const shouldEmitRawModelEvent = this._shouldEmitRawModelEvent(event);
+                if (eventType === 'response.output_item.added') {
+                    const outputItemAdded = event;
+                    if (typeof outputItemAdded.output_index === 'number' &&
+                        outputItemAdded.item) {
+                        outputItemsByIndex.set(outputItemAdded.output_index, outputItemAdded.item);
+                    }
+                }
                 if (eventType === 'response.created') {
                     yield {
                         type: 'response_started',
@@ -2283,56 +2358,42 @@ class OpenAIResponsesModel {
                     const terminalEvent = event;
                     finalResponse = terminalEvent.response;
                     const { response, ...remainingEvent } = terminalEvent;
-                    const { output, usage, id, ...remainingResponse } = response;
+                    const { output: _output, usage: _usage, id, ...remainingResponse } = response;
+                    const responseForSDKOutput = this._getResponseForSDKOutput(response);
                     yield {
                         type: 'response_done',
                         response: {
                             id: id,
                             requestId: getOpenAIResponseRequestId(response),
-                            output: convertToOutputItem(output),
-                            usage: {
-                                inputTokens: usage?.input_tokens ?? 0,
-                                outputTokens: usage?.output_tokens ?? 0,
-                                totalTokens: usage?.total_tokens ?? 0,
-                                inputTokensDetails: {
-                                    ...usage?.input_tokens_details,
-                                },
-                                outputTokensDetails: {
-                                    ...usage?.output_tokens_details,
-                                },
-                                requestUsageEntries: [
-                                    (0, responsesUtils_1.toRequestUsageEntry)(usage, 'responses.create'),
-                                ],
-                            },
+                            output: this._convertResponseOutputItems(responseForSDKOutput.output),
+                            usage: this._getStreamedResponseUsage(response),
                             providerData: remainingResponse,
                         },
                         providerData: remainingEvent,
                     };
-                    if (eventType === 'response.completed') {
+                }
+                else if (eventType === 'response.output_text.delta') {
+                    const { delta, ...remainingEvent } = event;
+                    const outputItem = typeof remainingEvent.output_index === 'number'
+                        ? outputItemsByIndex.get(remainingEvent.output_index)
+                        : undefined;
+                    if (this._shouldEmitOutputTextDelta(event, outputItem)) {
                         yield {
-                            type: 'model',
-                            event: event,
-                            providerData: {
-                                rawModelEventSource: rawModelEvents_1.OPENAI_RESPONSES_RAW_MODEL_EVENT_SOURCE,
-                            },
+                            type: 'output_text_delta',
+                            delta: delta,
+                            providerData: remainingEvent,
                         };
                     }
                 }
-                else if (eventType === 'response.output_text.delta') {
-                    const { delta, ...remainingEvent } = event;
+                if (shouldEmitRawModelEvent) {
                     yield {
-                        type: 'output_text_delta',
-                        delta: delta,
-                        providerData: remainingEvent,
+                        type: 'model',
+                        event: event,
+                        providerData: {
+                            rawModelEventSource: rawModelEvents_1.OPENAI_RESPONSES_RAW_MODEL_EVENT_SOURCE,
+                        },
                     };
                 }
-                yield {
-                    type: 'model',
-                    event: event,
-                    providerData: {
-                        rawModelEventSource: rawModelEvents_1.OPENAI_RESPONSES_RAW_MODEL_EVENT_SOURCE,
-                    },
-                };
             }
             if (request.tracing && span && finalResponse) {
                 span.spanData.response_id = finalResponse.id;