@openai/agents-openai 0.3.6 → 0.3.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/memory/openaiConversationsSession.js +22 -1
- package/dist/memory/openaiConversationsSession.js.map +1 -1
- package/dist/memory/openaiConversationsSession.mjs +22 -1
- package/dist/memory/openaiConversationsSession.mjs.map +1 -1
- package/dist/metadata.js +2 -2
- package/dist/metadata.mjs +2 -2
- package/dist/openaiChatCompletionsConverter.js +5 -1
- package/dist/openaiChatCompletionsConverter.js.map +1 -1
- package/dist/openaiChatCompletionsConverter.mjs +5 -1
- package/dist/openaiChatCompletionsConverter.mjs.map +1 -1
- package/dist/openaiChatCompletionsModel.js +12 -6
- package/dist/openaiChatCompletionsModel.js.map +1 -1
- package/dist/openaiChatCompletionsModel.mjs +12 -6
- package/dist/openaiChatCompletionsModel.mjs.map +1 -1
- package/dist/openaiChatCompletionsStreaming.js +23 -26
- package/dist/openaiChatCompletionsStreaming.js.map +1 -1
- package/dist/openaiChatCompletionsStreaming.mjs +23 -26
- package/dist/openaiChatCompletionsStreaming.mjs.map +1 -1
- package/dist/openaiResponsesModel.js +6 -1
- package/dist/openaiResponsesModel.js.map +1 -1
- package/dist/openaiResponsesModel.mjs +6 -1
- package/dist/openaiResponsesModel.mjs.map +1 -1
- package/dist/openaiTracingExporter.js +54 -40
- package/dist/openaiTracingExporter.js.map +1 -1
- package/dist/openaiTracingExporter.mjs +54 -40
- package/dist/openaiTracingExporter.mjs.map +1 -1
- package/package.json +4 -3
|
@@ -147,8 +147,9 @@ class OpenAIConversationsSession {
|
|
|
147
147
|
return;
|
|
148
148
|
}
|
|
149
149
|
const conversationId = await this.getSessionId();
|
|
150
|
+
const sanitizedItems = stripIdsAndProviderData(items);
|
|
150
151
|
await this.#client.conversations.items.create(conversationId, {
|
|
151
|
-
items: (0, openaiResponsesModel_1.getInputItems)(
|
|
152
|
+
items: (0, openaiResponsesModel_1.getInputItems)(sanitizedItems),
|
|
152
153
|
});
|
|
153
154
|
}
|
|
154
155
|
async popItem() {
|
|
@@ -177,6 +178,26 @@ exports.OpenAIConversationsSession = OpenAIConversationsSession;
|
|
|
177
178
|
// --------------------------------------------------------------
|
|
178
179
|
// Internals
|
|
179
180
|
// --------------------------------------------------------------
|
|
181
|
+
function stripIdsAndProviderData(items) {
|
|
182
|
+
return items.map((item) => {
|
|
183
|
+
if (Array.isArray(item) || item === null || typeof item !== 'object') {
|
|
184
|
+
return item;
|
|
185
|
+
}
|
|
186
|
+
// Conversations API rejects unknown top-level fields (e.g., model merged from providerData).
|
|
187
|
+
// Only strip providerData.model from message-like items; keep IDs intact for tool linkage.
|
|
188
|
+
const rest = { ...item };
|
|
189
|
+
const providerData = item.providerData;
|
|
190
|
+
if (providerData &&
|
|
191
|
+
typeof providerData === 'object' &&
|
|
192
|
+
!Array.isArray(providerData)) {
|
|
193
|
+
const pdObj = providerData;
|
|
194
|
+
const { model: _model, ...pdRest } = pdObj;
|
|
195
|
+
rest.providerData =
|
|
196
|
+
Object.keys(pdRest).length > 0 ? pdRest : undefined;
|
|
197
|
+
}
|
|
198
|
+
return rest;
|
|
199
|
+
});
|
|
200
|
+
}
|
|
180
201
|
const INPUT_CONTENT_TYPES = new Set([
|
|
181
202
|
'input_text',
|
|
182
203
|
'input_image',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiConversationsSession.js","sourceRoot":"","sources":["../../src/memory/openaiConversationsSession.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"openaiConversationsSession.js","sourceRoot":"","sources":["../../src/memory/openaiConversationsSession.ts"],"names":[],"mappings":";;;;;;AAqBA,0EAMC;AA3BD,oDAA4B;AAE5B,6CAA0E;AAC1E,qEAA6E;AAI7E,4DAG4B;AAWrB,KAAK,UAAU,+BAA+B,CACnD,MAAe;IAEf,MAAM,cAAc,GAAG,MAAM,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;IACnD,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;IAC1E,OAAO,QAAQ,CAAC,EAAE,CAAC;AACrB,CAAC;AAED,MAAa,0BAA0B;IAGrC,sGAAsG;IAC7F,CAAC,qCAAkB,CAAC,GAAG,eAAwB,CAAC;IAEzD,OAAO,CAAS;IAChB,eAAe,CAAU;IAEzB,YAAY,UAA6C,EAAE;QACzD,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QACtC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;IAChD,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1B,IAAI,CAAC,eAAe,GAAG,MAAM,+BAA+B,CAC1D,IAAI,CAAC,OAAO,CACb,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,eAAe,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAc;QAC3B,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACjD,wGAAwG;QACxG,MAAM,YAAY,GAAG,CAAC,IAAyB,EAAoB,EAAE;YACnE,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACpD,MAAM,OAAO,GAAG,IAA8B,CAAC;gBAC/C,OAAO;oBACL;wBACE,EAAE,EAAE,IAAI,CAAC,EAAE;wBACX,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,MAAM;wBACZ,OAAO,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;6BAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;4BACT,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gCAC5B,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;4BAC9C,CAAC;iCAAM,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gCACpC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;oCAChB,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC,SAAS,EAAE,CAAC;gCACrD,CAAC;qCAAM,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;oCACrB,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;gCAC3D,CAAC;4BACH,CAAC;iCAAM,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;gCACnC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;oCAChB,MAAM,QAAQ,GAAuB;wCACnC,IAAI,EAAE,YAAY;wCAClB,IAAI,EAAE,CAAC,CAAC,SAAS;qCAClB,CAAC;oCACF,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;wCACf,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;oCACjC,CAAC;oCACD,OAAO,QAAQ,CAAC;gCAClB,CAAC;gCACD,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;oCACf,MAAM,QAAQ,GAAuB;wCACnC,IAAI,EAAE,YAAY;wCAClB,IAAI,EAAE,CAAC,CAAC,QAAQ;qCACjB,CAAC;oCACF,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;wCACf,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;oCACjC,CAAC;oCACD,OAAO,QAAQ,CAAC;gCAClB,CAAC;qCAAM,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;oCACrB,MAAM,QAAQ,GAAuB;wCACnC,IAAI,EAAE,YAAY;wCAClB,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE;qCACxB,CAAC;oCACF,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;wCACf,QAAQ,CAAC,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC;oCACjC,CAAC;oCACD,OAAO,QAAQ,CAAC;gCAClB,CAAC;4BACH,CAAC;4BACD,iDAAiD;4BACjD,OAAO,IAAI,CAAC;wBACd,CAAC,CAAC;6BACD,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAA2B;qBACvD;iBACF,CAAC;YACJ,CAAC;YAED,MAAM,WAAW,GAAI,IAAmD;iBACrE,MAAM,CAAC;YAEV,IAAI,yBAAyB,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC3C,OAAO,IAAA,0CAAmB,EAAC,WAAW,CAAC,CAAC;YAC1C,CAAC;YAED,OAAO,IAAA,0CAAmB,EAAC,CAAC,IAA2C,CAAC,CAAC,CAAC;QAC5E,CAAC,CAAC;QAEF,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,KAAK,GAAqB,EAAE,CAAC;YACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE;gBACrE,KAAK,EAAE,KAAc;aACtB,CAAC,CAAC;YACH,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;gBAClC,KAAK,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;YACpC,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,UAAU,GAAuB,EAAE,CAAC;QAC1C,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,EAAE;YACrE,KAAK;YACL,KAAK,EAAE,MAAe;SACvB,CAAC,CAAC;QAEH,IAAI,KAAK,EAAE,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAClC,MAAM,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBAClB,SAAS;YACX,CAAC;YAED,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACvB,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;YAEtB,IAAI,KAAK,IAAI,KAAK,EAAE,CAAC;gBACnB,MAAM;YACR,CAAC;QACH,CAAC;QAED,yEAAyE;QACzE,MAAM,YAAY,GAAqB,EAAE,CAAC;QAC1C,KAAK,IAAI,KAAK,GAAG,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;YAC/D,YAAY,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1C,CAAC;QAED,IAAI,YAAY,CAAC,MAAM,GAAG,KAAK,EAAE,CAAC;YAChC,YAAY,CAAC,MAAM,CAAC,CAAC,EAAE,YAAY,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAuB;QACpC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACjD,MAAM,cAAc,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;QACtD,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,EAAE;YAC5D,KAAK,EAAE,IAAA,oCAAa,EAAC,cAAc,CAAC;SACrC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;QACjD,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,MAAM,MAAM,GAAI,MAA0B,CAAC,EAAE,CAAC;QAC9C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE;gBACpD,eAAe,EAAE,cAAc;aAChC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC9D,IAAI,CAAC,eAAe,GAAG,SAAS,CAAC;IACnC,CAAC;CACF;AAxLD,gEAwLC;AAED,iEAAiE;AACjE,aAAa;AACb,iEAAiE;AAEjE,SAAS,uBAAuB,CAAC,KAAuB;IACtD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YACrE,OAAO,IAAI,CAAC;QACd,CAAC;QACD,6FAA6F;QAC7F,2FAA2F;QAC3F,MAAM,IAAI,GAAG,EAAE,GAAI,IAAgC,EAAE,CAAC;QACtD,MAAM,YAAY,GAAI,IAAmC,CAAC,YAAY,CAAC;QAEvE,IACE,YAAY;YACZ,OAAO,YAAY,KAAK,QAAQ;YAChC,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAC5B,CAAC;YACD,MAAM,KAAK,GAAG,YAAuC,CAAC;YACtD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,KAAK,CAAC;YAC1C,IAAgC,CAAC,YAAY;gBAC5C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;QACxD,CAAC;QACD,OAAO,IAAsB,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC;IAClC,YAAY;IACZ,aAAa;IACb,YAAY;IACZ,aAAa;CACd,CAAC,CAAC;AAEH,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC;AAED,sHAAsH;AACtH,SAAS,yBAAyB,CAChC,KAAc;IAEd,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;QAC3B,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YACrB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,IAAI,GAAI,KAA4B,CAAC,IAAI,CAAC;QAChD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;YAClC,OAAO,KAAK,CAAC;QACf,CAAC;QAED,wGAAwG;QACxG,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,aAAa,CAAC,OAA0C;IAC/D,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,OAAO,CAAC,MAAM,CAAC;IACxB,CAAC;IAED,OAAO,CACL,IAAA,iCAAsB,GAAE;QACxB,IAAI,gBAAM,CAAC;YACT,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,IAAA,8BAAmB,GAAE;YAC/C,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,YAAY,EAAE,OAAO,CAAC,YAAY;YAClC,OAAO,EAAE,OAAO,CAAC,OAAO;SACzB,CAAC,CACH,CAAC;AACJ,CAAC"}
|
|
@@ -140,8 +140,9 @@ export class OpenAIConversationsSession {
|
|
|
140
140
|
return;
|
|
141
141
|
}
|
|
142
142
|
const conversationId = await this.getSessionId();
|
|
143
|
+
const sanitizedItems = stripIdsAndProviderData(items);
|
|
143
144
|
await this.#client.conversations.items.create(conversationId, {
|
|
144
|
-
items: getInputItems(
|
|
145
|
+
items: getInputItems(sanitizedItems),
|
|
145
146
|
});
|
|
146
147
|
}
|
|
147
148
|
async popItem() {
|
|
@@ -169,6 +170,26 @@ export class OpenAIConversationsSession {
|
|
|
169
170
|
// --------------------------------------------------------------
|
|
170
171
|
// Internals
|
|
171
172
|
// --------------------------------------------------------------
|
|
173
|
+
function stripIdsAndProviderData(items) {
|
|
174
|
+
return items.map((item) => {
|
|
175
|
+
if (Array.isArray(item) || item === null || typeof item !== 'object') {
|
|
176
|
+
return item;
|
|
177
|
+
}
|
|
178
|
+
// Conversations API rejects unknown top-level fields (e.g., model merged from providerData).
|
|
179
|
+
// Only strip providerData.model from message-like items; keep IDs intact for tool linkage.
|
|
180
|
+
const rest = { ...item };
|
|
181
|
+
const providerData = item.providerData;
|
|
182
|
+
if (providerData &&
|
|
183
|
+
typeof providerData === 'object' &&
|
|
184
|
+
!Array.isArray(providerData)) {
|
|
185
|
+
const pdObj = providerData;
|
|
186
|
+
const { model: _model, ...pdRest } = pdObj;
|
|
187
|
+
rest.providerData =
|
|
188
|
+
Object.keys(pdRest).length > 0 ? pdRest : undefined;
|
|
189
|
+
}
|
|
190
|
+
return rest;
|
|
191
|
+
});
|
|
192
|
+
}
|
|
172
193
|
const INPUT_CONTENT_TYPES = new Set([
|
|
173
194
|
'input_text',
|
|
174
195
|
'input_image',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiConversationsSession.mjs","sourceRoot":"","sources":["../../src/memory/openaiConversationsSession.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"openaiConversationsSession.mjs","sourceRoot":"","sources":["../../src/memory/openaiConversationsSession.ts"],"names":[],"mappings":"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"}
|
package/dist/metadata.js
CHANGED
|
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
4
4
|
exports.METADATA = void 0;
|
|
5
5
|
exports.METADATA = {
|
|
6
6
|
"name": "@openai/agents-openai",
|
|
7
|
-
"version": "0.3.
|
|
7
|
+
"version": "0.3.8",
|
|
8
8
|
"versions": {
|
|
9
|
-
"@openai/agents-openai": "0.3.
|
|
9
|
+
"@openai/agents-openai": "0.3.8",
|
|
10
10
|
"@openai/agents-core": "workspace:*",
|
|
11
11
|
"openai": "^6"
|
|
12
12
|
}
|
package/dist/metadata.mjs
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// This file is automatically generated
|
|
2
2
|
export const METADATA = {
|
|
3
3
|
"name": "@openai/agents-openai",
|
|
4
|
-
"version": "0.3.
|
|
4
|
+
"version": "0.3.8",
|
|
5
5
|
"versions": {
|
|
6
|
-
"@openai/agents-openai": "0.3.
|
|
6
|
+
"@openai/agents-openai": "0.3.8",
|
|
7
7
|
"@openai/agents-core": "workspace:*",
|
|
8
8
|
"openai": "^6"
|
|
9
9
|
}
|
|
@@ -160,7 +160,11 @@ function itemsToMessages(items) {
|
|
|
160
160
|
};
|
|
161
161
|
const ensureAssistantMessage = () => {
|
|
162
162
|
if (!currentAssistantMsg) {
|
|
163
|
-
currentAssistantMsg = {
|
|
163
|
+
currentAssistantMsg = {
|
|
164
|
+
role: 'assistant',
|
|
165
|
+
content: null,
|
|
166
|
+
tool_calls: [],
|
|
167
|
+
};
|
|
164
168
|
}
|
|
165
169
|
return currentAssistantMsg;
|
|
166
170
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsConverter.js","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":";;AAeA,8CAWC;AAED,gEA6BC;AAED,sDAsFC;AAcD,
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsConverter.js","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -152,7 +152,11 @@ export function itemsToMessages(items) {
|
|
|
152
152
|
};
|
|
153
153
|
const ensureAssistantMessage = () => {
|
|
154
154
|
if (!currentAssistantMsg) {
|
|
155
|
-
currentAssistantMsg = {
|
|
155
|
+
currentAssistantMsg = {
|
|
156
|
+
role: 'assistant',
|
|
157
|
+
content: null,
|
|
158
|
+
tool_calls: [],
|
|
159
|
+
};
|
|
156
160
|
}
|
|
157
161
|
return currentAssistantMsg;
|
|
158
162
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsConverter.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsConverter.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -59,10 +59,11 @@ class OpenAIChatCompletionsModel {
|
|
|
59
59
|
],
|
|
60
60
|
});
|
|
61
61
|
}
|
|
62
|
-
|
|
62
|
+
const hasContent = message.content !== undefined &&
|
|
63
63
|
message.content !== null &&
|
|
64
64
|
// Azure OpenAI returns empty string instead of null for tool calls, causing parser rejection
|
|
65
|
-
!(message.tool_calls && message.content === '')
|
|
65
|
+
!(message.tool_calls && message.content === '');
|
|
66
|
+
if (hasContent) {
|
|
66
67
|
const { content, ...rest } = message;
|
|
67
68
|
output.push({
|
|
68
69
|
id: response.id,
|
|
@@ -110,7 +111,7 @@ class OpenAIChatCompletionsModel {
|
|
|
110
111
|
status: 'completed',
|
|
111
112
|
});
|
|
112
113
|
}
|
|
113
|
-
|
|
114
|
+
if (message.tool_calls) {
|
|
114
115
|
for (const tool_call of message.tool_calls) {
|
|
115
116
|
if (tool_call.type === 'function') {
|
|
116
117
|
// Note: custom tools are not supported for now
|
|
@@ -255,14 +256,16 @@ class OpenAIChatCompletionsModel {
|
|
|
255
256
|
presence_penalty: request.modelSettings.presencePenalty,
|
|
256
257
|
max_tokens: request.modelSettings.maxTokens,
|
|
257
258
|
tool_choice: (0, openaiChatCompletionsConverter_1.convertToolChoice)(request.modelSettings.toolChoice),
|
|
258
|
-
response_format: responseFormat,
|
|
259
259
|
parallel_tool_calls: parallelToolCalls,
|
|
260
|
-
stream,
|
|
260
|
+
stream: stream ? true : false,
|
|
261
261
|
stream_options: stream ? { include_usage: true } : undefined,
|
|
262
262
|
store: request.modelSettings.store,
|
|
263
263
|
prompt_cache_retention: request.modelSettings.promptCacheRetention,
|
|
264
264
|
...providerData,
|
|
265
265
|
};
|
|
266
|
+
if (responseFormat) {
|
|
267
|
+
requestData.response_format = responseFormat;
|
|
268
|
+
}
|
|
266
269
|
if (logger_1.default.dontLogModelData) {
|
|
267
270
|
logger_1.default.debug('Calling LLM');
|
|
268
271
|
}
|
|
@@ -285,7 +288,10 @@ class OpenAIChatCompletionsModel {
|
|
|
285
288
|
exports.OpenAIChatCompletionsModel = OpenAIChatCompletionsModel;
|
|
286
289
|
function getResponseFormat(outputType) {
|
|
287
290
|
if (outputType === 'text') {
|
|
288
|
-
|
|
291
|
+
// Avoid sending response_format for plain text responses because some Chat Completions
|
|
292
|
+
// compatible providers (e.g., Claude) reject non-json_schema values here. OpenAI's API
|
|
293
|
+
// already treats text as the default when the field is omitted.
|
|
294
|
+
return undefined;
|
|
289
295
|
}
|
|
290
296
|
if (outputType.type === 'json_schema') {
|
|
291
297
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsModel.js","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":";;;;;;AAAA,qDAO6B;AAS7B,yDAA8B;AAC9B,4CAAqC;AASrC,wFAA2F;AAC3F,wFAK0C;AAG7B,QAAA,OAAO,GAAG,SAAS,CAAC;AASjC,SAAS,mBAAmB,CAC1B,OAAsD;IAEtD,OAAO,CACL,WAAW,IAAI,OAAO;QACtB,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;QACrC,OAAO,CAAC,SAAS,KAAK,EAAE,CACzB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAa,0BAA0B;IACrC,OAAO,CAAS;IAChB,MAAM,CAAS;IACf,YAAY,MAAc,EAAE,KAAa;QACvC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAqB;QACrC,MAAM,QAAQ,GAAG,MAAM,IAAA,gCAAkB,EAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACvD,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;YAClC,IAAI,CAAC,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,aAAa;gBAChD,CAAC,CAAC;oBACE,WAAW,EAAE,OAAO,CAAC,aAAa,CAAC,WAAW;oBAC9C,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI;oBACjC,iBAAiB,EAAE,OAAO,CAAC,aAAa,CAAC,gBAAgB;oBACzD,gBAAgB,EAAE,OAAO,CAAC,aAAa,CAAC,eAAe;oBACvD,gBAAgB,EAAE,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM;oBACzD,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS;iBACjD;gBACH,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACjE,IAAI,IAAI,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpC,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAA+B,EAAE,CAAC;QAC9C,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5C,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAE5C,IAAI,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjC,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,EAAE;oBACX,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,gBAAgB;4BACtB,IAAI,EAAE,OAAO,CAAC,SAAS;yBACxB;qBACF;iBACF,CAAC,CAAC;YACL,CAAC;YACD,
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsModel.js","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,10 +53,11 @@ export class OpenAIChatCompletionsModel {
|
|
|
53
53
|
],
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
|
-
|
|
56
|
+
const hasContent = message.content !== undefined &&
|
|
57
57
|
message.content !== null &&
|
|
58
58
|
// Azure OpenAI returns empty string instead of null for tool calls, causing parser rejection
|
|
59
|
-
!(message.tool_calls && message.content === '')
|
|
59
|
+
!(message.tool_calls && message.content === '');
|
|
60
|
+
if (hasContent) {
|
|
60
61
|
const { content, ...rest } = message;
|
|
61
62
|
output.push({
|
|
62
63
|
id: response.id,
|
|
@@ -104,7 +105,7 @@ export class OpenAIChatCompletionsModel {
|
|
|
104
105
|
status: 'completed',
|
|
105
106
|
});
|
|
106
107
|
}
|
|
107
|
-
|
|
108
|
+
if (message.tool_calls) {
|
|
108
109
|
for (const tool_call of message.tool_calls) {
|
|
109
110
|
if (tool_call.type === 'function') {
|
|
110
111
|
// Note: custom tools are not supported for now
|
|
@@ -249,14 +250,16 @@ export class OpenAIChatCompletionsModel {
|
|
|
249
250
|
presence_penalty: request.modelSettings.presencePenalty,
|
|
250
251
|
max_tokens: request.modelSettings.maxTokens,
|
|
251
252
|
tool_choice: convertToolChoice(request.modelSettings.toolChoice),
|
|
252
|
-
response_format: responseFormat,
|
|
253
253
|
parallel_tool_calls: parallelToolCalls,
|
|
254
|
-
stream,
|
|
254
|
+
stream: stream ? true : false,
|
|
255
255
|
stream_options: stream ? { include_usage: true } : undefined,
|
|
256
256
|
store: request.modelSettings.store,
|
|
257
257
|
prompt_cache_retention: request.modelSettings.promptCacheRetention,
|
|
258
258
|
...providerData,
|
|
259
259
|
};
|
|
260
|
+
if (responseFormat) {
|
|
261
|
+
requestData.response_format = responseFormat;
|
|
262
|
+
}
|
|
260
263
|
if (logger.dontLogModelData) {
|
|
261
264
|
logger.debug('Calling LLM');
|
|
262
265
|
}
|
|
@@ -278,7 +281,10 @@ export class OpenAIChatCompletionsModel {
|
|
|
278
281
|
}
|
|
279
282
|
function getResponseFormat(outputType) {
|
|
280
283
|
if (outputType === 'text') {
|
|
281
|
-
|
|
284
|
+
// Avoid sending response_format for plain text responses because some Chat Completions
|
|
285
|
+
// compatible providers (e.g., Claude) reject non-json_schema values here. OpenAI's API
|
|
286
|
+
// already treats text as the default when the field is omitted.
|
|
287
|
+
return undefined;
|
|
282
288
|
}
|
|
283
289
|
if (outputType.type === 'json_schema') {
|
|
284
290
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsModel.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"OAAO,EAEL,KAAK,EACL,kBAAkB,EAClB,gBAAgB,EAChB,oBAAoB,EACpB,cAAc,GACf,MAAM,qBAAqB;OASrB,MAAM;OACN,EAAE,OAAO,EAAE;OASX,EAAE,uCAAuC,EAAE;OAC3C,EACL,iBAAiB,EACjB,YAAY,EACZ,kBAAkB,EAClB,eAAe,GAChB;AAGD,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC;AASjC,SAAS,mBAAmB,CAC1B,OAAsD;IAEtD,OAAO,CACL,WAAW,IAAI,OAAO;QACtB,OAAO,OAAO,CAAC,SAAS,KAAK,QAAQ;QACrC,OAAO,CAAC,SAAS,KAAK,EAAE,CACzB,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,0BAA0B;IACrC,OAAO,CAAS;IAChB,MAAM,CAAS;IACf,YAAY,MAAc,EAAE,KAAa;QACvC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAqB;QACrC,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YACvD,IAAI,CAAC,QAAQ,CAAC,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;YAClC,IAAI,CAAC,QAAQ,CAAC,YAAY,GAAG,OAAO,CAAC,aAAa;gBAChD,CAAC,CAAC;oBACE,WAAW,EAAE,OAAO,CAAC,aAAa,CAAC,WAAW;oBAC9C,KAAK,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI;oBACjC,iBAAiB,EAAE,OAAO,CAAC,aAAa,CAAC,gBAAgB;oBACzD,gBAAgB,EAAE,OAAO,CAAC,aAAa,CAAC,eAAe;oBACvD,gBAAgB,EAAE,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,MAAM;oBACzD,SAAS,EAAE,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS;iBACjD;gBACH,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACjE,IAAI,IAAI,IAAI,OAAO,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;gBACrC,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC;YACpC,CAAC;YACD,OAAO,QAAQ,CAAC;QAClB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAA+B,EAAE,CAAC;QAC9C,IAAI,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5C,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YAE5C,IAAI,mBAAmB,CAAC,OAAO,CAAC,EAAE,CAAC;gBACjC,MAAM,CAAC,IAAI,CAAC;oBACV,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,EAAE;oBACX,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,gBAAgB;4BACtB,IAAI,EAAE,OAAO,CAAC,SAAS;yBACxB;qBACF;iBACF,CAAC,CAAC;YACL,CAAC;YACD,
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsModel.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ async function* convertChatCompletionsStreamToResponses(response, stream) {
|
|
|
6
6
|
let usage = undefined;
|
|
7
7
|
const state = {
|
|
8
8
|
started: false,
|
|
9
|
-
|
|
10
|
-
|
|
9
|
+
text_content: null,
|
|
10
|
+
refusal_content: null,
|
|
11
11
|
function_calls: {},
|
|
12
12
|
reasoning: '',
|
|
13
13
|
};
|
|
@@ -33,11 +33,12 @@ async function* convertChatCompletionsStreamToResponses(response, stream) {
|
|
|
33
33
|
const delta = chunk.choices[0].delta;
|
|
34
34
|
// Handle text
|
|
35
35
|
if (delta.content) {
|
|
36
|
-
if (!state.
|
|
37
|
-
state.
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
if (!state.text_content) {
|
|
37
|
+
state.text_content = {
|
|
38
|
+
text: '',
|
|
39
|
+
type: 'output_text',
|
|
40
|
+
providerData: { annotations: [] },
|
|
41
|
+
};
|
|
41
42
|
}
|
|
42
43
|
yield {
|
|
43
44
|
type: 'output_text_delta',
|
|
@@ -46,7 +47,7 @@ async function* convertChatCompletionsStreamToResponses(response, stream) {
|
|
|
46
47
|
...chunk,
|
|
47
48
|
},
|
|
48
49
|
};
|
|
49
|
-
state.
|
|
50
|
+
state.text_content.text += delta.content;
|
|
50
51
|
}
|
|
51
52
|
if ('reasoning' in delta &&
|
|
52
53
|
delta.reasoning &&
|
|
@@ -55,13 +56,10 @@ async function* convertChatCompletionsStreamToResponses(response, stream) {
|
|
|
55
56
|
}
|
|
56
57
|
// Handle refusals
|
|
57
58
|
if ('refusal' in delta && delta.refusal) {
|
|
58
|
-
if (!state.
|
|
59
|
-
state.
|
|
60
|
-
!state.text_content_index_and_output ? 0 : 1,
|
|
61
|
-
{ refusal: '', type: 'refusal' },
|
|
62
|
-
];
|
|
59
|
+
if (!state.refusal_content) {
|
|
60
|
+
state.refusal_content = { refusal: '', type: 'refusal' };
|
|
63
61
|
}
|
|
64
|
-
state.
|
|
62
|
+
state.refusal_content.refusal += delta.refusal;
|
|
65
63
|
}
|
|
66
64
|
// Handle tool calls
|
|
67
65
|
if (delta.tool_calls) {
|
|
@@ -92,22 +90,21 @@ async function* convertChatCompletionsStreamToResponses(response, stream) {
|
|
|
92
90
|
rawContent: [{ type: 'reasoning_text', text: state.reasoning }],
|
|
93
91
|
});
|
|
94
92
|
}
|
|
95
|
-
if (state.
|
|
96
|
-
|
|
97
|
-
|
|
93
|
+
if (state.text_content || state.refusal_content) {
|
|
94
|
+
const content = [];
|
|
95
|
+
if (state.text_content) {
|
|
96
|
+
content.push(state.text_content);
|
|
97
|
+
}
|
|
98
|
+
if (state.refusal_content) {
|
|
99
|
+
content.push(state.refusal_content);
|
|
100
|
+
}
|
|
101
|
+
outputs.push({
|
|
98
102
|
id: openaiChatCompletionsModel_1.FAKE_ID,
|
|
99
|
-
content
|
|
103
|
+
content,
|
|
100
104
|
role: 'assistant',
|
|
101
105
|
type: 'message',
|
|
102
106
|
status: 'completed',
|
|
103
|
-
};
|
|
104
|
-
if (state.text_content_index_and_output) {
|
|
105
|
-
assistant_msg.content.push(state.text_content_index_and_output[1]);
|
|
106
|
-
}
|
|
107
|
-
if (state.refusal_content_index_and_output) {
|
|
108
|
-
assistant_msg.content.push(state.refusal_content_index_and_output[1]);
|
|
109
|
-
}
|
|
110
|
-
outputs.push(assistant_msg);
|
|
107
|
+
});
|
|
111
108
|
}
|
|
112
109
|
for (const function_call of Object.values(state.function_calls)) {
|
|
113
110
|
// Some providers, such as Bedrock, may send two items:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsStreaming.js","sourceRoot":"","sources":["../src/openaiChatCompletionsStreaming.ts"],"names":[],"mappings":";;AAcA,
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsStreaming.js","sourceRoot":"","sources":["../src/openaiChatCompletionsStreaming.ts"],"names":[],"mappings":"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"}
|