@openai/agents-openai 0.3.5 → 0.3.6
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/index.d.ts +1 -0
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/index.mjs +1 -0
- package/dist/index.mjs.map +1 -1
- package/dist/memory/openaiConversationsSession.d.ts +3 -1
- package/dist/memory/openaiConversationsSession.js +3 -0
- package/dist/memory/openaiConversationsSession.js.map +1 -1
- package/dist/memory/openaiConversationsSession.mjs +3 -0
- package/dist/memory/openaiConversationsSession.mjs.map +1 -1
- package/dist/memory/openaiResponsesCompactionSession.d.ts +87 -0
- package/dist/memory/openaiResponsesCompactionSession.js +235 -0
- package/dist/memory/openaiResponsesCompactionSession.js.map +1 -0
- package/dist/memory/openaiResponsesCompactionSession.mjs +228 -0
- package/dist/memory/openaiResponsesCompactionSession.mjs.map +1 -0
- package/dist/memory/openaiSessionApi.d.ts +12 -0
- package/dist/memory/openaiSessionApi.js +12 -0
- package/dist/memory/openaiSessionApi.js.map +1 -0
- package/dist/memory/openaiSessionApi.mjs +9 -0
- package/dist/memory/openaiSessionApi.mjs.map +1 -0
- package/dist/metadata.js +2 -2
- package/dist/metadata.mjs +2 -2
- package/dist/openaiChatCompletionsConverter.d.ts +1 -1
- package/dist/openaiChatCompletionsConverter.js +9 -4
- package/dist/openaiChatCompletionsConverter.js.map +1 -1
- package/dist/openaiChatCompletionsConverter.mjs +9 -4
- package/dist/openaiChatCompletionsConverter.mjs.map +1 -1
- package/dist/openaiResponsesModel.js +41 -0
- package/dist/openaiResponsesModel.js.map +1 -1
- package/dist/openaiResponsesModel.mjs +42 -1
- package/dist/openaiResponsesModel.mjs.map +1 -1
- package/dist/tools.d.ts +10 -10
- package/dist/types/providerData.d.ts +10 -10
- package/package.json +2 -2
|
@@ -0,0 +1,228 @@
|
|
|
1
|
+
import OpenAI from 'openai';
|
|
2
|
+
import { getLogger, MemorySession, RequestUsage, UserError, } from '@openai/agents-core';
|
|
3
|
+
import { DEFAULT_OPENAI_MODEL, getDefaultOpenAIClient } from "../defaults.mjs";
|
|
4
|
+
import { OPENAI_SESSION_API, } from "./openaiSessionApi.mjs";
|
|
5
|
+
const DEFAULT_COMPACTION_THRESHOLD = 10;
|
|
6
|
+
const logger = getLogger('openai-agents:openai:compaction');
|
|
7
|
+
/**
|
|
8
|
+
* Session decorator that triggers `responses.compact` when the stored history grows.
|
|
9
|
+
*
|
|
10
|
+
* This session is intended to be passed to `run()` so the runner can automatically supply the
|
|
11
|
+
* latest `responseId` and invoke compaction after each completed turn is persisted.
|
|
12
|
+
*
|
|
13
|
+
* To debug compaction decisions, enable the `debug` logger for
|
|
14
|
+
* `openai-agents:openai:compaction` (for example, `DEBUG=openai-agents:openai:compaction`).
|
|
15
|
+
*/
|
|
16
|
+
export class OpenAIResponsesCompactionSession {
|
|
17
|
+
[OPENAI_SESSION_API] = 'responses';
|
|
18
|
+
client;
|
|
19
|
+
underlyingSession;
|
|
20
|
+
model;
|
|
21
|
+
responseId;
|
|
22
|
+
shouldTriggerCompaction;
|
|
23
|
+
compactionCandidateItems;
|
|
24
|
+
sessionItems;
|
|
25
|
+
constructor(options) {
|
|
26
|
+
this.client = resolveClient(options);
|
|
27
|
+
if (isOpenAIConversationsSessionDelegate(options.underlyingSession)) {
|
|
28
|
+
throw new UserError('OpenAIResponsesCompactionSession does not support OpenAIConversationsSession as an underlying session.');
|
|
29
|
+
}
|
|
30
|
+
this.underlyingSession = options.underlyingSession ?? new MemorySession();
|
|
31
|
+
const model = (options.model ?? DEFAULT_OPENAI_MODEL).trim();
|
|
32
|
+
assertSupportedOpenAIResponsesCompactionModel(model);
|
|
33
|
+
this.model = model;
|
|
34
|
+
this.shouldTriggerCompaction =
|
|
35
|
+
options.shouldTriggerCompaction ?? defaultShouldTriggerCompaction;
|
|
36
|
+
this.compactionCandidateItems = undefined;
|
|
37
|
+
this.sessionItems = undefined;
|
|
38
|
+
}
|
|
39
|
+
async runCompaction(args = {}) {
|
|
40
|
+
this.responseId = args.responseId ?? this.responseId ?? undefined;
|
|
41
|
+
if (!this.responseId) {
|
|
42
|
+
throw new UserError('OpenAIResponsesCompactionSession.runCompaction requires a responseId from the last completed turn.');
|
|
43
|
+
}
|
|
44
|
+
const { compactionCandidateItems, sessionItems } = await this.ensureCompactionCandidates();
|
|
45
|
+
const shouldTriggerCompaction = args.force === true
|
|
46
|
+
? true
|
|
47
|
+
: await this.shouldTriggerCompaction({
|
|
48
|
+
responseId: this.responseId,
|
|
49
|
+
compactionCandidateItems,
|
|
50
|
+
sessionItems,
|
|
51
|
+
});
|
|
52
|
+
if (!shouldTriggerCompaction) {
|
|
53
|
+
logger.debug('skip: decision hook %o', {
|
|
54
|
+
responseId: this.responseId,
|
|
55
|
+
});
|
|
56
|
+
return null;
|
|
57
|
+
}
|
|
58
|
+
logger.debug('compact: start %o', {
|
|
59
|
+
responseId: this.responseId,
|
|
60
|
+
model: this.model,
|
|
61
|
+
});
|
|
62
|
+
const compacted = await this.client.responses.compact({
|
|
63
|
+
previous_response_id: this.responseId,
|
|
64
|
+
model: this.model,
|
|
65
|
+
});
|
|
66
|
+
await this.underlyingSession.clearSession();
|
|
67
|
+
const outputItems = (compacted.output ?? []);
|
|
68
|
+
if (outputItems.length > 0) {
|
|
69
|
+
await this.underlyingSession.addItems(outputItems);
|
|
70
|
+
}
|
|
71
|
+
this.compactionCandidateItems = selectCompactionCandidateItems(outputItems);
|
|
72
|
+
this.sessionItems = outputItems;
|
|
73
|
+
logger.debug('compact: done %o', {
|
|
74
|
+
responseId: this.responseId,
|
|
75
|
+
outputItemCount: outputItems.length,
|
|
76
|
+
candidateCount: this.compactionCandidateItems.length,
|
|
77
|
+
});
|
|
78
|
+
return {
|
|
79
|
+
usage: toRequestUsage(compacted.usage),
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
async getSessionId() {
|
|
83
|
+
return this.underlyingSession.getSessionId();
|
|
84
|
+
}
|
|
85
|
+
async getItems(limit) {
|
|
86
|
+
return this.underlyingSession.getItems(limit);
|
|
87
|
+
}
|
|
88
|
+
async addItems(items) {
|
|
89
|
+
if (items.length === 0) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
await this.underlyingSession.addItems(items);
|
|
93
|
+
if (this.compactionCandidateItems) {
|
|
94
|
+
const candidates = selectCompactionCandidateItems(items);
|
|
95
|
+
if (candidates.length > 0) {
|
|
96
|
+
this.compactionCandidateItems = [
|
|
97
|
+
...this.compactionCandidateItems,
|
|
98
|
+
...candidates,
|
|
99
|
+
];
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
if (this.sessionItems) {
|
|
103
|
+
this.sessionItems = [...this.sessionItems, ...items];
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
async popItem() {
|
|
107
|
+
const popped = await this.underlyingSession.popItem();
|
|
108
|
+
if (!popped) {
|
|
109
|
+
return popped;
|
|
110
|
+
}
|
|
111
|
+
if (this.sessionItems) {
|
|
112
|
+
const index = this.sessionItems.lastIndexOf(popped);
|
|
113
|
+
if (index >= 0) {
|
|
114
|
+
this.sessionItems.splice(index, 1);
|
|
115
|
+
}
|
|
116
|
+
else {
|
|
117
|
+
this.sessionItems = await this.underlyingSession.getItems();
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
if (this.compactionCandidateItems) {
|
|
121
|
+
const isCandidate = selectCompactionCandidateItems([popped]).length > 0;
|
|
122
|
+
if (isCandidate) {
|
|
123
|
+
const index = this.compactionCandidateItems.indexOf(popped);
|
|
124
|
+
if (index >= 0) {
|
|
125
|
+
this.compactionCandidateItems.splice(index, 1);
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
// Fallback when the popped item reference differs from stored candidates.
|
|
129
|
+
this.compactionCandidateItems = selectCompactionCandidateItems(await this.underlyingSession.getItems());
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}
|
|
133
|
+
return popped;
|
|
134
|
+
}
|
|
135
|
+
async clearSession() {
|
|
136
|
+
await this.underlyingSession.clearSession();
|
|
137
|
+
this.compactionCandidateItems = [];
|
|
138
|
+
this.sessionItems = [];
|
|
139
|
+
}
|
|
140
|
+
async ensureCompactionCandidates() {
|
|
141
|
+
if (this.compactionCandidateItems && this.sessionItems) {
|
|
142
|
+
logger.debug('candidates: cached %o', {
|
|
143
|
+
candidateCount: this.compactionCandidateItems.length,
|
|
144
|
+
});
|
|
145
|
+
return {
|
|
146
|
+
compactionCandidateItems: [...this.compactionCandidateItems],
|
|
147
|
+
sessionItems: [...this.sessionItems],
|
|
148
|
+
};
|
|
149
|
+
}
|
|
150
|
+
const history = await this.underlyingSession.getItems();
|
|
151
|
+
const compactionCandidates = selectCompactionCandidateItems(history);
|
|
152
|
+
this.compactionCandidateItems = compactionCandidates;
|
|
153
|
+
this.sessionItems = history;
|
|
154
|
+
logger.debug('candidates: initialized %o', {
|
|
155
|
+
historyLength: history.length,
|
|
156
|
+
candidateCount: compactionCandidates.length,
|
|
157
|
+
});
|
|
158
|
+
return {
|
|
159
|
+
compactionCandidateItems: [...compactionCandidates],
|
|
160
|
+
sessionItems: [...history],
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
function resolveClient(options) {
|
|
165
|
+
if (options.client) {
|
|
166
|
+
return options.client;
|
|
167
|
+
}
|
|
168
|
+
const defaultClient = getDefaultOpenAIClient();
|
|
169
|
+
if (defaultClient) {
|
|
170
|
+
return defaultClient;
|
|
171
|
+
}
|
|
172
|
+
return new OpenAI();
|
|
173
|
+
}
|
|
174
|
+
function defaultShouldTriggerCompaction({ compactionCandidateItems, }) {
|
|
175
|
+
return compactionCandidateItems.length >= DEFAULT_COMPACTION_THRESHOLD;
|
|
176
|
+
}
|
|
177
|
+
function selectCompactionCandidateItems(items) {
|
|
178
|
+
return items.filter((item) => {
|
|
179
|
+
if (item.type === 'compaction') {
|
|
180
|
+
return false;
|
|
181
|
+
}
|
|
182
|
+
return !(item.type === 'message' && item.role === 'user');
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
function assertSupportedOpenAIResponsesCompactionModel(model) {
|
|
186
|
+
if (!isOpenAIModelName(model)) {
|
|
187
|
+
throw new Error(`Unsupported model for OpenAI responses compaction: ${JSON.stringify(model)}`);
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
function isOpenAIModelName(model) {
|
|
191
|
+
const trimmed = model.trim();
|
|
192
|
+
if (!trimmed) {
|
|
193
|
+
return false;
|
|
194
|
+
}
|
|
195
|
+
// The OpenAI SDK does not ship a runtime allowlist of model names.
|
|
196
|
+
// This check relies on common model naming conventions and intentionally allows unknown `gpt-*` variants.
|
|
197
|
+
// Fine-tuned model IDs typically look like: ft:gpt-4o-mini:org:project:suffix.
|
|
198
|
+
const withoutFineTunePrefix = trimmed.startsWith('ft:')
|
|
199
|
+
? trimmed.slice('ft:'.length)
|
|
200
|
+
: trimmed;
|
|
201
|
+
const root = withoutFineTunePrefix.split(':', 1)[0];
|
|
202
|
+
// Allow unknown `gpt-*` variants to avoid needing updates whenever new models ship.
|
|
203
|
+
if (root.startsWith('gpt-')) {
|
|
204
|
+
return true;
|
|
205
|
+
}
|
|
206
|
+
// Allow the `o*` reasoning models
|
|
207
|
+
if (/^o\d[a-z0-9-]*$/i.test(root)) {
|
|
208
|
+
return true;
|
|
209
|
+
}
|
|
210
|
+
return false;
|
|
211
|
+
}
|
|
212
|
+
function toRequestUsage(usage) {
|
|
213
|
+
return new RequestUsage({
|
|
214
|
+
inputTokens: usage?.input_tokens ?? 0,
|
|
215
|
+
outputTokens: usage?.output_tokens ?? 0,
|
|
216
|
+
totalTokens: usage?.total_tokens ?? 0,
|
|
217
|
+
inputTokensDetails: { ...usage?.input_tokens_details },
|
|
218
|
+
outputTokensDetails: { ...usage?.output_tokens_details },
|
|
219
|
+
endpoint: 'responses.compact',
|
|
220
|
+
});
|
|
221
|
+
}
|
|
222
|
+
function isOpenAIConversationsSessionDelegate(underlyingSession) {
|
|
223
|
+
return (!!underlyingSession &&
|
|
224
|
+
typeof underlyingSession === 'object' &&
|
|
225
|
+
OPENAI_SESSION_API in underlyingSession &&
|
|
226
|
+
underlyingSession[OPENAI_SESSION_API] === 'conversations');
|
|
227
|
+
}
|
|
228
|
+
//# sourceMappingURL=openaiResponsesCompactionSession.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openaiResponsesCompactionSession.mjs","sourceRoot":"","sources":["../../src/memory/openaiResponsesCompactionSession.ts"],"names":[],"mappings":"OAAO,MAAM,MAAM,QAAQ;OACpB,EACL,SAAS,EACT,aAAa,EACb,YAAY,EACZ,SAAS,GACV,MAAM,qBAAqB;OAQrB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE;OAChD,EACL,kBAAkB,GAEnB;AAED,MAAM,4BAA4B,GAAG,EAAE,CAAC;AACxC,MAAM,MAAM,GAAG,SAAS,CAAC,iCAAiC,CAAC,CAAC;AA4D5D;;;;;;;;GAQG;AACH,MAAM,OAAO,gCAAgC;IAKlC,CAAC,kBAAkB,CAAC,GAAG,WAAoB,CAAC;IAEpC,MAAM,CAAS;IACf,iBAAiB,CAAU;IAC3B,KAAK,CAAwB;IACtC,UAAU,CAAU;IACX,uBAAuB,CAER;IACxB,wBAAwB,CAA+B;IACvD,YAAY,CAA+B;IAEnD,YAAY,OAAgD;QAC1D,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;QACrC,IAAI,oCAAoC,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpE,MAAM,IAAI,SAAS,CACjB,wGAAwG,CACzG,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,iBAAiB,GAAG,OAAO,CAAC,iBAAiB,IAAI,IAAI,aAAa,EAAE,CAAC;QAC1E,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC,KAAK,IAAI,oBAAoB,CAAC,CAAC,IAAI,EAAE,CAAC;QAE7D,6CAA6C,CAAC,KAAK,CAAC,CAAC;QACrD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,IAAI,CAAC,uBAAuB;YAC1B,OAAO,CAAC,uBAAuB,IAAI,8BAA8B,CAAC;QACpE,IAAI,CAAC,wBAAwB,GAAG,SAAS,CAAC;QAC1C,IAAI,CAAC,YAAY,GAAG,SAAS,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,OAAsC,EAAE;QAExC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,IAAI,SAAS,CAAC;QAElE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,IAAI,SAAS,CACjB,oGAAoG,CACrG,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,wBAAwB,EAAE,YAAY,EAAE,GAC9C,MAAM,IAAI,CAAC,0BAA0B,EAAE,CAAC;QAC1C,MAAM,uBAAuB,GAC3B,IAAI,CAAC,KAAK,KAAK,IAAI;YACjB,CAAC,CAAC,IAAI;YACN,CAAC,CAAC,MAAM,IAAI,CAAC,uBAAuB,CAAC;gBACjC,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,wBAAwB;gBACxB,YAAY;aACb,CAAC,CAAC;QACT,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,wBAAwB,EAAE;gBACrC,UAAU,EAAE,IAAI,CAAC,UAAU;aAC5B,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE;YAChC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;QAEH,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;YACpD,oBAAoB,EAAE,IAAI,CAAC,UAAU;YACrC,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;QAC5C,MAAM,WAAW,GAAG,CAAC,SAAS,CAAC,MAAM,IAAI,EAAE,CAAqB,CAAC;QACjE,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;QACrD,CAAC;QACD,IAAI,CAAC,wBAAwB,GAAG,8BAA8B,CAAC,WAAW,CAAC,CAAC;QAC5E,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC;QAEhC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE;YAC/B,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,eAAe,EAAE,WAAW,CAAC,MAAM;YACnC,cAAc,EAAE,IAAI,CAAC,wBAAwB,CAAC,MAAM;SACrD,CAAC,CAAC;QAEH,OAAO;YACL,KAAK,EAAE,cAAc,CAAC,SAAS,CAAC,KAAK,CAAC;SACvC,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;IAC/C,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAc;QAC3B,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,KAAuB;QACpC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QAED,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAC7C,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAClC,MAAM,UAAU,GAAG,8BAA8B,CAAC,KAAK,CAAC,CAAC;YACzD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC,wBAAwB,GAAG;oBAC9B,GAAG,IAAI,CAAC,wBAAwB;oBAChC,GAAG,UAAU;iBACd,CAAC;YACJ,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,IAAI,CAAC,YAAY,GAAG,CAAC,GAAG,IAAI,CAAC,YAAY,EAAE,GAAG,KAAK,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;QACtD,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtB,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YACpD,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gBACf,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;YAC9D,CAAC;QACH,CAAC;QACD,IAAI,IAAI,CAAC,wBAAwB,EAAE,CAAC;YAClC,MAAM,WAAW,GAAG,8BAA8B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;YACxE,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,KAAK,GAAG,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAC5D,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;oBACf,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBACjD,CAAC;qBAAM,CAAC;oBACN,0EAA0E;oBAC1E,IAAI,CAAC,wBAAwB,GAAG,8BAA8B,CAC5D,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CACxC,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;QAC5C,IAAI,CAAC,wBAAwB,GAAG,EAAE,CAAC;QACnC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IACzB,CAAC;IAEO,KAAK,CAAC,0BAA0B;QAItC,IAAI,IAAI,CAAC,wBAAwB,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACvD,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE;gBACpC,cAAc,EAAE,IAAI,CAAC,wBAAwB,CAAC,MAAM;aACrD,CAAC,CAAC;YACH,OAAO;gBACL,wBAAwB,EAAE,CAAC,GAAG,IAAI,CAAC,wBAAwB,CAAC;gBAC5D,YAAY,EAAE,CAAC,GAAG,IAAI,CAAC,YAAY,CAAC;aACrC,CAAC;QACJ,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC;QACxD,MAAM,oBAAoB,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;QACrE,IAAI,CAAC,wBAAwB,GAAG,oBAAoB,CAAC;QACrD,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC;QAC5B,MAAM,CAAC,KAAK,CAAC,4BAA4B,EAAE;YACzC,aAAa,EAAE,OAAO,CAAC,MAAM;YAC7B,cAAc,EAAE,oBAAoB,CAAC,MAAM;SAC5C,CAAC,CAAC;QACH,OAAO;YACL,wBAAwB,EAAE,CAAC,GAAG,oBAAoB,CAAC;YACnD,YAAY,EAAE,CAAC,GAAG,OAAO,CAAC;SAC3B,CAAC;IACJ,CAAC;CACF;AAED,SAAS,aAAa,CACpB,OAAgD;IAEhD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,OAAO,OAAO,CAAC,MAAM,CAAC;IACxB,CAAC;IAED,MAAM,aAAa,GAAG,sBAAsB,EAAE,CAAC;IAC/C,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,OAAO,IAAI,MAAM,EAAE,CAAC;AACtB,CAAC;AAED,SAAS,8BAA8B,CAAC,EACtC,wBAAwB,GACiB;IACzC,OAAO,wBAAwB,CAAC,MAAM,IAAI,4BAA4B,CAAC;AACzE,CAAC;AAED,SAAS,8BAA8B,CACrC,KAAuB;IAEvB,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;QAC3B,IAAI,IAAI,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;YAC/B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,6CAA6C,CAAC,KAAa;IAClE,IAAI,CAAC,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,sDAAsD,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAC9E,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAa;IACtC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACf,CAAC;IACD,mEAAmE;IACnE,0GAA0G;IAC1G,+EAA+E;IAC/E,MAAM,qBAAqB,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;QACrD,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC;QAC7B,CAAC,CAAC,OAAO,CAAC;IACZ,MAAM,IAAI,GAAG,qBAAqB,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpD,oFAAoF;IACpF,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,kCAAkC;IAClC,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAS,cAAc,CACrB,KAAiD;IAEjD,OAAO,IAAI,YAAY,CAAC;QACtB,WAAW,EAAE,KAAK,EAAE,YAAY,IAAI,CAAC;QACrC,YAAY,EAAE,KAAK,EAAE,aAAa,IAAI,CAAC;QACvC,WAAW,EAAE,KAAK,EAAE,YAAY,IAAI,CAAC;QACrC,kBAAkB,EAAE,EAAE,GAAG,KAAK,EAAE,oBAAoB,EAAE;QACtD,mBAAmB,EAAE,EAAE,GAAG,KAAK,EAAE,qBAAqB,EAAE;QACxD,QAAQ,EAAE,mBAAmB;KAC9B,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oCAAoC,CAC3C,iBAAsC;IAEtC,OAAO,CACL,CAAC,CAAC,iBAAiB;QACnB,OAAO,iBAAiB,KAAK,QAAQ;QACrC,kBAAkB,IAAI,iBAAiB;QACtC,iBAA6D,CAC5D,kBAAkB,CACnB,KAAK,eAAe,CACtB,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Branding symbol used to tag OpenAI-backed sessions with the underlying API family they rely on.
|
|
3
|
+
*
|
|
4
|
+
* This enables runtime checks (and some type narrowing) to prevent mixing sessions that are not
|
|
5
|
+
* compatible with each other (e.g., using a Conversations-based session where a Responses-only
|
|
6
|
+
* feature is required).
|
|
7
|
+
*/
|
|
8
|
+
export declare const OPENAI_SESSION_API: unique symbol;
|
|
9
|
+
export type OpenAISessionAPI = 'responses' | 'conversations';
|
|
10
|
+
export type OpenAISessionApiTagged<API extends OpenAISessionAPI> = {
|
|
11
|
+
readonly [OPENAI_SESSION_API]: API;
|
|
12
|
+
};
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.OPENAI_SESSION_API = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Branding symbol used to tag OpenAI-backed sessions with the underlying API family they rely on.
|
|
6
|
+
*
|
|
7
|
+
* This enables runtime checks (and some type narrowing) to prevent mixing sessions that are not
|
|
8
|
+
* compatible with each other (e.g., using a Conversations-based session where a Responses-only
|
|
9
|
+
* feature is required).
|
|
10
|
+
*/
|
|
11
|
+
exports.OPENAI_SESSION_API = Symbol('OPENAI_SESSION_API');
|
|
12
|
+
//# sourceMappingURL=openaiSessionApi.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openaiSessionApi.js","sourceRoot":"","sources":["../../src/memory/openaiSessionApi.ts"],"names":[],"mappings":";;;AAAA;;;;;;GAMG;AACU,QAAA,kBAAkB,GAAkB,MAAM,CAAC,oBAAoB,CAAC,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Branding symbol used to tag OpenAI-backed sessions with the underlying API family they rely on.
|
|
3
|
+
*
|
|
4
|
+
* This enables runtime checks (and some type narrowing) to prevent mixing sessions that are not
|
|
5
|
+
* compatible with each other (e.g., using a Conversations-based session where a Responses-only
|
|
6
|
+
* feature is required).
|
|
7
|
+
*/
|
|
8
|
+
export const OPENAI_SESSION_API = Symbol('OPENAI_SESSION_API');
|
|
9
|
+
//# sourceMappingURL=openaiSessionApi.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openaiSessionApi.mjs","sourceRoot":"","sources":["../../src/memory/openaiSessionApi.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAkB,MAAM,CAAC,oBAAoB,CAAC,CAAC"}
|
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.6",
|
|
8
8
|
"versions": {
|
|
9
|
-
"@openai/agents-openai": "0.3.
|
|
9
|
+
"@openai/agents-openai": "0.3.6",
|
|
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.6",
|
|
5
5
|
"versions": {
|
|
6
|
-
"@openai/agents-openai": "0.3.
|
|
6
|
+
"@openai/agents-openai": "0.3.6",
|
|
7
7
|
"@openai/agents-core": "workspace:*",
|
|
8
8
|
"openai": "^6"
|
|
9
9
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { ChatCompletionAssistantMessageParam, ChatCompletionContentPart, ChatCompletionMessageParam, ChatCompletionTool, ChatCompletionToolChoiceOption } from 'openai/resources/chat';
|
|
2
2
|
import { SerializedHandoff, SerializedTool, ModelRequest, protocol } from '@openai/agents-core';
|
|
3
|
-
export declare function convertToolChoice(toolChoice: 'auto' | 'required' | 'none' | string | undefined | null): ChatCompletionToolChoiceOption | undefined;
|
|
3
|
+
export declare function convertToolChoice(toolChoice: 'auto' | 'required' | 'none' | (string & {}) | undefined | null): ChatCompletionToolChoiceOption | undefined;
|
|
4
4
|
export declare function extractAllAssistantContent(content: protocol.AssistantMessageItem['content']): string | ChatCompletionAssistantMessageParam['content'];
|
|
5
5
|
export declare function extractAllUserContent(content: protocol.UserMessageItem['content']): string | ChatCompletionContentPart[];
|
|
6
6
|
export declare function itemsToMessages(items: ModelRequest['input']): ChatCompletionMessageParam[];
|
|
@@ -10,10 +10,12 @@ const agents_core_1 = require("@openai/agents-core");
|
|
|
10
10
|
function convertToolChoice(toolChoice) {
|
|
11
11
|
if (toolChoice == undefined || toolChoice == null)
|
|
12
12
|
return undefined;
|
|
13
|
-
if (toolChoice === 'auto'
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
return
|
|
13
|
+
if (toolChoice === 'auto')
|
|
14
|
+
return 'auto';
|
|
15
|
+
if (toolChoice === 'required')
|
|
16
|
+
return 'required';
|
|
17
|
+
if (toolChoice === 'none')
|
|
18
|
+
return 'none';
|
|
17
19
|
return {
|
|
18
20
|
type: 'function',
|
|
19
21
|
function: { name: toolChoice },
|
|
@@ -274,6 +276,9 @@ function itemsToMessages(items) {
|
|
|
274
276
|
...item.providerData,
|
|
275
277
|
});
|
|
276
278
|
}
|
|
279
|
+
else if (item.type === 'compaction') {
|
|
280
|
+
throw new agents_core_1.UserError('Compaction items are not supported for chat completions. Please use the Responses API when working with compaction.');
|
|
281
|
+
}
|
|
277
282
|
else {
|
|
278
283
|
const exhaustive = item; // ensures that the type is exhaustive
|
|
279
284
|
throw new Error(`Unknown item type: ${JSON.stringify(exhaustive)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsConverter.js","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":";;AAeA,
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsConverter.js","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,12 @@ import { UserError, } from '@openai/agents-core';
|
|
|
2
2
|
export function convertToolChoice(toolChoice) {
|
|
3
3
|
if (toolChoice == undefined || toolChoice == null)
|
|
4
4
|
return undefined;
|
|
5
|
-
if (toolChoice === 'auto'
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
return
|
|
5
|
+
if (toolChoice === 'auto')
|
|
6
|
+
return 'auto';
|
|
7
|
+
if (toolChoice === 'required')
|
|
8
|
+
return 'required';
|
|
9
|
+
if (toolChoice === 'none')
|
|
10
|
+
return 'none';
|
|
9
11
|
return {
|
|
10
12
|
type: 'function',
|
|
11
13
|
function: { name: toolChoice },
|
|
@@ -266,6 +268,9 @@ export function itemsToMessages(items) {
|
|
|
266
268
|
...item.providerData,
|
|
267
269
|
});
|
|
268
270
|
}
|
|
271
|
+
else if (item.type === 'compaction') {
|
|
272
|
+
throw new UserError('Compaction items are not supported for chat completions. Please use the Responses API when working with compaction.');
|
|
273
|
+
}
|
|
269
274
|
else {
|
|
270
275
|
const exhaustive = item; // ensures that the type is exhaustive
|
|
271
276
|
throw new Error(`Unknown item type: ${JSON.stringify(exhaustive)}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openaiChatCompletionsConverter.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":"OAOO,EAKL,SAAS,GACV,MAAM,qBAAqB;AAE5B,MAAM,UAAU,iBAAiB,CAC/B,
|
|
1
|
+
{"version":3,"file":"openaiChatCompletionsConverter.mjs","sourceRoot":"","sources":["../src/openaiChatCompletionsConverter.ts"],"names":[],"mappings":"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"}
|
|
@@ -957,6 +957,17 @@ function getInputItems(input) {
|
|
|
957
957
|
}
|
|
958
958
|
throw new agents_core_1.UserError(`Unsupported built-in tool call type: ${JSON.stringify(item)}`);
|
|
959
959
|
}
|
|
960
|
+
if (item.type === 'compaction') {
|
|
961
|
+
const encryptedContent = item.encrypted_content ?? item.encryptedContent;
|
|
962
|
+
if (typeof encryptedContent !== 'string') {
|
|
963
|
+
throw new agents_core_1.UserError('Compaction item missing encrypted_content');
|
|
964
|
+
}
|
|
965
|
+
return {
|
|
966
|
+
type: 'compaction',
|
|
967
|
+
id: item.id ?? undefined,
|
|
968
|
+
encrypted_content: encryptedContent,
|
|
969
|
+
};
|
|
970
|
+
}
|
|
960
971
|
if (item.type === 'unknown') {
|
|
961
972
|
return {
|
|
962
973
|
...(0, providerData_1.camelOrSnakeToSnakeCase)(item.providerData), // place here to prioritize the below fields
|
|
@@ -1225,6 +1236,20 @@ function convertToOutputItem(items) {
|
|
|
1225
1236
|
};
|
|
1226
1237
|
return output;
|
|
1227
1238
|
}
|
|
1239
|
+
else if (item.type === 'compaction') {
|
|
1240
|
+
const { encrypted_content, created_by, ...providerData } = item;
|
|
1241
|
+
if (typeof encrypted_content !== 'string') {
|
|
1242
|
+
throw new agents_core_1.UserError('Compaction item missing encrypted_content');
|
|
1243
|
+
}
|
|
1244
|
+
const output = {
|
|
1245
|
+
type: 'compaction',
|
|
1246
|
+
id: item.id ?? undefined,
|
|
1247
|
+
encrypted_content,
|
|
1248
|
+
created_by,
|
|
1249
|
+
providerData,
|
|
1250
|
+
};
|
|
1251
|
+
return output;
|
|
1252
|
+
}
|
|
1228
1253
|
return {
|
|
1229
1254
|
type: 'unknown',
|
|
1230
1255
|
id: item.id,
|
|
@@ -1335,6 +1360,9 @@ class OpenAIResponsesModel {
|
|
|
1335
1360
|
totalTokens: response.usage?.total_tokens ?? 0,
|
|
1336
1361
|
inputTokensDetails: { ...response.usage?.input_tokens_details },
|
|
1337
1362
|
outputTokensDetails: { ...response.usage?.output_tokens_details },
|
|
1363
|
+
requestUsageEntries: [
|
|
1364
|
+
toRequestUsageEntry(response.usage, 'responses.create'),
|
|
1365
|
+
],
|
|
1338
1366
|
}),
|
|
1339
1367
|
output: convertToOutputItem(response.output),
|
|
1340
1368
|
responseId: response.id,
|
|
@@ -1387,6 +1415,9 @@ class OpenAIResponsesModel {
|
|
|
1387
1415
|
outputTokensDetails: {
|
|
1388
1416
|
...usage?.output_tokens_details,
|
|
1389
1417
|
},
|
|
1418
|
+
requestUsageEntries: [
|
|
1419
|
+
toRequestUsageEntry(usage, 'responses.create'),
|
|
1420
|
+
],
|
|
1390
1421
|
},
|
|
1391
1422
|
providerData: remainingResponse,
|
|
1392
1423
|
},
|
|
@@ -1454,4 +1485,14 @@ function normalizeInstructions(instructions) {
|
|
|
1454
1485
|
}
|
|
1455
1486
|
return undefined;
|
|
1456
1487
|
}
|
|
1488
|
+
function toRequestUsageEntry(usage, endpoint) {
|
|
1489
|
+
return new agents_core_1.RequestUsage({
|
|
1490
|
+
inputTokens: usage?.input_tokens ?? 0,
|
|
1491
|
+
outputTokens: usage?.output_tokens ?? 0,
|
|
1492
|
+
totalTokens: usage?.total_tokens ?? 0,
|
|
1493
|
+
inputTokensDetails: { ...usage?.input_tokens_details },
|
|
1494
|
+
outputTokensDetails: { ...usage?.output_tokens_details },
|
|
1495
|
+
endpoint,
|
|
1496
|
+
});
|
|
1497
|
+
}
|
|
1457
1498
|
//# sourceMappingURL=openaiResponsesModel.js.map
|