@framers/agentos 0.13.7 → 0.13.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/api/agent.d.ts +8 -4
- package/dist/api/agent.d.ts.map +1 -1
- package/dist/api/agent.js +6 -0
- package/dist/api/agent.js.map +1 -1
- package/dist/api/generateText.d.ts +9 -0
- package/dist/api/generateText.d.ts.map +1 -1
- package/dist/api/generateText.js +8 -3
- package/dist/api/generateText.js.map +1 -1
- package/dist/api/gmi.d.ts.map +1 -1
- package/dist/api/gmi.js +82 -38
- package/dist/api/gmi.js.map +1 -1
- package/dist/api/runtime/completionGateway.d.ts +7 -1
- package/dist/api/runtime/completionGateway.d.ts.map +1 -1
- package/dist/api/runtime/completionGateway.js +91 -6
- package/dist/api/runtime/completionGateway.js.map +1 -1
- package/dist/api/runtime/gmiPersona.d.ts +1 -1
- package/dist/api/runtime/gmiPersona.d.ts.map +1 -1
- package/dist/api/runtime/gmiPersona.js +7 -11
- package/dist/api/runtime/gmiPersona.js.map +1 -1
- package/dist/api/runtime/gmiSession.d.ts +13 -1
- package/dist/api/runtime/gmiSession.d.ts.map +1 -1
- package/dist/api/runtime/gmiSession.js +29 -7
- package/dist/api/runtime/gmiSession.js.map +1 -1
- package/dist/api/runtime/responseFormatForProvider.d.ts +8 -0
- package/dist/api/runtime/responseFormatForProvider.d.ts.map +1 -1
- package/dist/api/runtime/responseFormatForProvider.js +14 -0
- package/dist/api/runtime/responseFormatForProvider.js.map +1 -1
- package/dist/cognition/substrate/GMI.d.ts.map +1 -1
- package/dist/cognition/substrate/GMI.js +3 -1
- package/dist/cognition/substrate/GMI.js.map +1 -1
- package/dist/safety/evaluation/Evaluator.d.ts.map +1 -1
- package/dist/safety/evaluation/Evaluator.js +7 -0
- package/dist/safety/evaluation/Evaluator.js.map +1 -1
- package/dist/safety/evaluation/IEvaluator.d.ts +1 -1
- package/dist/safety/evaluation/IEvaluator.d.ts.map +1 -1
- package/dist/safety/evaluation/index.d.ts +1 -0
- package/dist/safety/evaluation/index.d.ts.map +1 -1
- package/dist/safety/evaluation/index.js +1 -0
- package/dist/safety/evaluation/index.js.map +1 -1
- package/dist/safety/evaluation/wordErrorRate.d.ts +24 -0
- package/dist/safety/evaluation/wordErrorRate.d.ts.map +1 -0
- package/dist/safety/evaluation/wordErrorRate.js +61 -0
- package/dist/safety/evaluation/wordErrorRate.js.map +1 -0
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmiPersona.js","sourceRoot":"","sources":["../../../src/api/runtime/gmiPersona.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"gmiPersona.js","sourceRoot":"","sources":["../../../src/api/runtime/gmiPersona.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,13 @@ export interface GmiTurnOptions {
|
|
|
24
24
|
blockLabel?: string;
|
|
25
25
|
/** Stops the turn: the model call in progress is aborted, and the turn ends with the abort error. */
|
|
26
26
|
abortSignal?: AbortSignal;
|
|
27
|
+
/**
|
|
28
|
+
* Checks the reply of a turn that ended without error, before the session
|
|
29
|
+
* keeps it. A throw keeps nothing of the turn (no history, no
|
|
30
|
+
* `memoryProvider.observe`) and is the turn's error: a structured send whose
|
|
31
|
+
* answer does not parse adds nothing, as `agent()`'s send adds nothing.
|
|
32
|
+
*/
|
|
33
|
+
acceptReply?: () => void;
|
|
27
34
|
}
|
|
28
35
|
/** What the GMI's hooks need to know about the turn about to run. */
|
|
29
36
|
export interface GmiTurnContext {
|
|
@@ -36,6 +43,8 @@ export interface GmiTurnContext {
|
|
|
36
43
|
providerId: string;
|
|
37
44
|
modelId: string;
|
|
38
45
|
}) => void;
|
|
46
|
+
/** True for a structured send: its model calls go without tools. */
|
|
47
|
+
structured?: boolean;
|
|
39
48
|
}
|
|
40
49
|
/** The GMI that serves one turn. */
|
|
41
50
|
export interface GmiForTurn {
|
|
@@ -94,7 +103,10 @@ export declare function runGmiTurn(deps: GmiSessionDeps, input: MessageContent,
|
|
|
94
103
|
* `send()`: the whole turn, folded into a `GenerateTextResult` (with `object`
|
|
95
104
|
* when a schema was given). Rejects with the GMI's error, its code kept, when
|
|
96
105
|
* the turn failed; an error thrown before the turn ran (no provider or model
|
|
97
|
-
* resolves, the memory cannot be built) is rethrown as it was thrown.
|
|
106
|
+
* resolves, the memory cannot be built) is rethrown as it was thrown. A
|
|
107
|
+
* structured answer is parsed before the session keeps the turn, so one that
|
|
108
|
+
* does not parse or validate rejects with `ObjectGenerationError` and leaves
|
|
109
|
+
* nothing in the history.
|
|
98
110
|
*/
|
|
99
111
|
export declare function sendGmiTurn(deps: GmiSessionDeps, input: MessageContent, turn: GmiTurnOptions): Promise<GenerateTextResult & {
|
|
100
112
|
object?: unknown;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmiSession.d.ts","sourceRoot":"","sources":["../../../src/api/runtime/gmiSession.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AACnC,OAAO,EAGL,KAAK,cAAc,EAEnB,KAAK,IAAI,EAIV,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAyC,KAAK,kBAAkB,EAAE,KAAK,cAAc,EAAE,KAAK,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAC1I,OAAO,EAA+B,KAAK,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEtF,OAAO,EAAwB,KAAK,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,KAAK,EAAE,oBAAoB,EAAqB,MAAM,sBAAsB,CAAC;AACpF,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACxE,OAAO,KAAK,EAAuB,YAAY,EAAE,MAAM,aAAa,CAAC;AAErE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAqB,MAAM,iBAAiB,CAAC;AAGnE,yGAAyG;AACzG,qBAAa,QAAQ;IACnB,OAAO,CAAC,IAAI,CAAoC;IAEhD,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,CAAC;CAS/B;AAED,+CAA+C;AAC/C,MAAM,WAAW,cAAc;IAC7B,qHAAqH;IACrH,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAClC,kFAAkF;IAClF,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sDAAsD;IACtD,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qGAAqG;IACrG,WAAW,CAAC,EAAE,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"gmiSession.d.ts","sourceRoot":"","sources":["../../../src/api/runtime/gmiSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -191,6 +191,7 @@ export async function* runGmiTurn(deps, input, turn, folder, surface = 'generate
|
|
|
191
191
|
prompt: typeof input === 'string' ? input : undefined,
|
|
192
192
|
memoryContext,
|
|
193
193
|
onModelCall: ({ providerId, modelId }) => folder.route(providerId, modelId),
|
|
194
|
+
structured: turn.responseSchema !== undefined,
|
|
194
195
|
});
|
|
195
196
|
writer = deps.history?.beginTurn(turn.blockLabel, epochAtStart);
|
|
196
197
|
const turnInput = {
|
|
@@ -267,6 +268,14 @@ export async function* runGmiTurn(deps, input, turn, folder, surface = 'generate
|
|
|
267
268
|
writer?.abort({ partial: true });
|
|
268
269
|
}
|
|
269
270
|
else {
|
|
271
|
+
try {
|
|
272
|
+
turn.acceptReply?.();
|
|
273
|
+
}
|
|
274
|
+
catch (refusal) {
|
|
275
|
+
// A refused reply leaves nothing of the turn behind.
|
|
276
|
+
writer?.abort();
|
|
277
|
+
throw refusal;
|
|
278
|
+
}
|
|
270
279
|
writer?.commit();
|
|
271
280
|
const memoryProvider = deps.opts.memoryProvider;
|
|
272
281
|
if (memoryProvider?.observe) {
|
|
@@ -309,11 +318,11 @@ export async function* runGmiTurn(deps, input, turn, folder, surface = 'generate
|
|
|
309
318
|
}
|
|
310
319
|
}
|
|
311
320
|
/** Parses a structured send's answer: the schema tool's arguments when a step carried them, else the reply text. */
|
|
312
|
-
function parseStructured(folder,
|
|
321
|
+
function parseStructured(folder, schema) {
|
|
313
322
|
const structured = folder.structuredOutput();
|
|
314
323
|
let raw = structured;
|
|
315
324
|
if (structured === undefined || typeof structured === 'string') {
|
|
316
|
-
const source = typeof structured === 'string' ? structured :
|
|
325
|
+
const source = typeof structured === 'string' ? structured : folder.text();
|
|
317
326
|
try {
|
|
318
327
|
raw = JSON.parse(source);
|
|
319
328
|
}
|
|
@@ -323,7 +332,7 @@ function parseStructured(folder, result, schema) {
|
|
|
323
332
|
}
|
|
324
333
|
const safe = schema.safeParse(raw);
|
|
325
334
|
if (!safe.success) {
|
|
326
|
-
throw new ObjectGenerationError('session.send: provider-enforced JSON failed Zod validation',
|
|
335
|
+
throw new ObjectGenerationError('session.send: provider-enforced JSON failed Zod validation', folder.text(), safe.error);
|
|
327
336
|
}
|
|
328
337
|
return safe.data;
|
|
329
338
|
}
|
|
@@ -331,11 +340,24 @@ function parseStructured(folder, result, schema) {
|
|
|
331
340
|
* `send()`: the whole turn, folded into a `GenerateTextResult` (with `object`
|
|
332
341
|
* when a schema was given). Rejects with the GMI's error, its code kept, when
|
|
333
342
|
* the turn failed; an error thrown before the turn ran (no provider or model
|
|
334
|
-
* resolves, the memory cannot be built) is rethrown as it was thrown.
|
|
343
|
+
* resolves, the memory cannot be built) is rethrown as it was thrown. A
|
|
344
|
+
* structured answer is parsed before the session keeps the turn, so one that
|
|
345
|
+
* does not parse or validate rejects with `ObjectGenerationError` and leaves
|
|
346
|
+
* nothing in the history.
|
|
335
347
|
*/
|
|
336
348
|
export async function sendGmiTurn(deps, input, turn) {
|
|
337
349
|
const folder = new GmiTurnFolder({ cacheDiagnostics: Boolean(turn.options?.cacheDiagnostics) });
|
|
338
|
-
const
|
|
350
|
+
const schema = turn.responseSchema;
|
|
351
|
+
let object;
|
|
352
|
+
const checked = schema
|
|
353
|
+
? {
|
|
354
|
+
...turn,
|
|
355
|
+
acceptReply: () => {
|
|
356
|
+
object = parseStructured(folder, schema);
|
|
357
|
+
},
|
|
358
|
+
}
|
|
359
|
+
: turn;
|
|
360
|
+
const run = runGmiTurn(deps, input, checked, folder);
|
|
339
361
|
let recorded = [];
|
|
340
362
|
for (;;) {
|
|
341
363
|
const next = await run.next();
|
|
@@ -348,9 +370,9 @@ export async function sendGmiTurn(deps, input, turn) {
|
|
|
348
370
|
if (error)
|
|
349
371
|
throw error;
|
|
350
372
|
const result = folder.toGenerateTextResult(recorded);
|
|
351
|
-
if (!
|
|
373
|
+
if (!schema)
|
|
352
374
|
return result;
|
|
353
|
-
return { ...result, object
|
|
375
|
+
return { ...result, object };
|
|
354
376
|
}
|
|
355
377
|
/**
|
|
356
378
|
* `stream()`: the turn's chunks as a `StreamTextResult`. The promises settle
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gmiSession.js","sourceRoot":"","sources":["../../../src/api/runtime/gmiSession.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"gmiSession.js","sourceRoot":"","sources":["../../../src/api/runtime/gmiSession.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EACL,kBAAkB,EAClB,kBAAkB,GAOnB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAiE,MAAM,oBAAoB,CAAC;AAC1I,OAAO,EAAE,2BAA2B,EAAyB,MAAM,kBAAkB,CAAC;AACtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAsB,MAAM,iBAAiB,CAAC;AAI3E,OAAO,EAAE,2BAA2B,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE1F,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAEhF,yGAAyG;AACzG,MAAM,OAAO,QAAQ;IAArB;QACU,SAAI,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAWlD,CAAC;IATC,OAAO;QACL,IAAI,OAAoB,CAAC;QACzB,MAAM,IAAI,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YACzC,OAAO,GAAG,OAAO,CAAC;QACpB,CAAC,CAAC,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;QAC3B,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACtC,OAAO,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;CACF;AAoED,8GAA8G;AAC9G,KAAK,UAAU,qBAAqB,CAAC,IAAkB,EAAE,QAAgB;IACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC;IACrC,IAAI,CAAC,QAAQ,EAAE,UAAU;QAAE,OAAO,SAAS,CAAC;IAC5C,MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,EAAE,SAAS,IAAI,iBAAiB,CAAC;IAC7E,MAAM,WAAW,GAAG,IAAI,CAAC,qBAAqB,EAAE,WAAW,IAAI,2BAA2B,CAAC;IAC3F,IAAI,KAAgD,CAAC;IACrD,IAAI,QAAQ,GAAG,KAAK,CAAC;IACrB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;YAChC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,CAAC;YAC9C,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;gBAC5B,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;oBACtB,QAAQ,GAAG,IAAI,CAAC;oBAChB,OAAO,CAAC,IAAI,CAAC,CAAC;gBAChB,CAAC,EAAE,SAAS,CAAC,CAAC;YAChB,CAAC,CAAC;SACH,CAAC,CAAC;QACH,IAAI,QAAQ;YAAE,OAAO,CAAC,IAAI,CAAC,gDAAgD,SAAS,wCAAwC,CAAC,CAAC;QAC9H,OAAO,MAAM,EAAE,WAAW,IAAI,SAAS,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,IAAI,CAAC,gFAAgF,EAAE,KAAK,CAAC,CAAC;QACtG,OAAO,SAAS,CAAC;IACnB,CAAC;YAAS,CAAC;QACT,IAAI,KAAK;YAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,WAAW,CAAC,QAA6B,EAAE,IAA0B,EAAE,IAAY;IAC1F,IAAI,CAAC;QACH,KAAK,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IAC9E,CAAC;IAAC,OAAO,YAAY,EAAE,CAAC;QACtB,OAAO,CAAC,IAAI,CAAC,0CAA0C,EAAE,YAAY,CAAC,CAAC;IACzE,CAAC;AACH,CAAC;AAsBD;;;;;;;;;GASG;AACH,SAAS,SAAS,CAAC,MAA6C,EAAE,OAAuB,EAAE,IAAiB;IAC1G,MAAM,KAAK,GAAe,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;IACnF,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,oBAAoB,CAAC;QACnB,QAAQ,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE;QAC/B,KAAK,EAAE,IAAI,CAAC,OAAO,IAAI,EAAE;QACzB,KAAK,EAAE,EAAE,GAAG,KAAK,EAAE;QACnB,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,YAAY,EAAE,IAAI,CAAC,YAAY;QAC/B,OAAO;QACP,UAAU,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,SAAS;KACxC,CAAC,CAAC;IACH,6EAA6E;IAC7E,OAAO,MAAM,CAAC,kBAAkB,CAAC;SAC9B,IAAI,CAAC,CAAC,EAAE,kBAAkB,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;SACpI,IAAI,CACH,GAAG,EAAE,CAAC,SAAS,EACf,GAAG,EAAE,CAAC,SAAS,CAChB,CAAC;AACN,CAAC;AAED,0HAA0H;AAC1H,KAAK,UAAU,eAAe,CAAC,IAAkB,EAAE,MAAqB,EAAE,IAA8B,EAAE,KAAwB;IAChI,IAAI,CAAC,IAAI,CAAC,iBAAiB;QAAE,OAAO;IACpC,MAAM,KAAK,GAAe,EAAE,YAAY,EAAE,CAAC,EAAE,gBAAgB,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;IACnF,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACjC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC;YAC5C,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC3B,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;YAC3E,KAAK;YACL,IAAI,EAAE,IAAI,CAAC,SAAS;YACpB,GAAG,CAAC,IAAI,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,gBAAgB,EAAE,IAAI,CAAC,gBAA0D,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACtI,CAAC,CAAC;QACH,uDAAuD;QACvD,IAAI,QAAQ,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,gBAAgB,KAAK,SAAS,EAAE,CAAC;YACzF,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAAC,OAAO,SAAS,EAAE,CAAC;QACnB,OAAO,CAAC,IAAI,CAAC,yCAAyC,EAAE,SAAS,CAAC,CAAC;IACrE,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,UAAU,CAC/B,IAAoB,EACpB,KAAqB,EACrB,IAAoB,EACpB,MAAqB,EACrB,UAA0B,cAAc;IAExC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;IAC1C,MAAM,QAAQ,GAA+B,EAAE,CAAC;IAChD,IAAI,MAAqC,CAAC;IAC1C,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,UAA6C,CAAC;IAClD,gEAAgE;IAChE,MAAM,YAAY,GAAyB,EAAE,CAAC;IAC9C,MAAM,WAAW,GAA6B,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;IAC/E,0EAA0E;IAC1E,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,OAAoH,CAAC;IACzH,8EAA8E;IAC9E,6EAA6E;IAC7E,0EAA0E;IAC1E,4EAA4E;IAC5E,WAAW;IACX,MAAM,KAAK,GAAG,GAAS,EAAE;QACvB,IAAI,CAAC,OAAO;YAAE,OAAO;QACrB,MAAM,QAAQ,GAAG,gBAAgB,CAAC;YAChC,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW;YACtD,YAAY,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC;SAC5C,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC3C,QAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,CAAC;YAC3B,eAAe,GAAG,IAAI,CAAC;QACzB,CAAC;QACD,OAAO,GAAG,SAAS,CAAC;IACtB,CAAC,CAAC;IAEF,IAAI,CAAC;QACH,4DAA4D;QAC5D,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;QAC3C,MAAM,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAClE,MAAM,QAAQ,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC;QAEnF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;QACnC,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC;QAC5B,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC;QACvB,GAAG,CAAC,cAAc,EAAE,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAC,CAAC;QAC9D,MAAM,aAAa,GAAG,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC,MAAM,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnH,MAAM,CAAC,OAAO,EAAE,CAAC;YACf,MAAM,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;YACrD,aAAa;YACb,WAAW,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,EAAE,OAAO,CAAC;YAC3E,UAAU,EAAE,IAAI,CAAC,cAAc,KAAK,SAAS;SAC9C,CAAC,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAEhE,MAAM,SAAS,GAAiB;YAC9B,aAAa,EAAE,QAAQ,UAAU,EAAE,EAAE;YACrC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,IAAI,EAAE,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAkB,CAAC,kBAAkB;YACjG,OAAO,EAAE,KAAgC;YACzC,QAAQ,EAAE;gBACR,cAAc,EAAE,IAAI,CAAC,cAAc,IAAI,IAAI;gBAC3C,OAAO,EAAE;oBACP,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC;oBACvB,GAAG,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAClH,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC/D;aACF;SACF,CAAC;QAEF,IAAI,SAAS,GAAsB,EAAE,CAAC;QACtC,4EAA4E;QAC5E,mEAAmE;QACnE,IAAI,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC/B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,GAAG,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC;YAC3D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;gBACnB,KAAK,kBAAkB,CAAC,iBAAiB;oBACvC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAE,KAAK,CAAC,OAA6B,IAAI,EAAE,CAAC,CAAC,CAAC;oBAChE,MAAM;gBACR,KAAK,kBAAkB,CAAC,aAAa,CAAC,CAAC,CAAC;oBACtC,KAAK,EAAE,CAAC;oBACR,MAAM,IAAI,GAAG,KAAK,CAAC,OAAmC,CAAC;oBACvD,MAAM,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;oBAC1D,OAAO,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;oBAClD,SAAS,GAAG,EAAE,CAAC;oBACf,YAAY,CAAC,IAAI,CACf,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE;wBAC9B,UAAU,EAAE,IAAI,CAAC,UAAU;wBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;wBACrB,KAAK,EAAE,IAAI,CAAC,KAAK;wBACjB,GAAG,EAAE,IAAI,CAAC,GAAG;wBACb,wEAAwE;wBACxE,YAAY,EAAE,IAAI,CAAC,gBAAgB,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,2BAA2B,CAAC,IAAI,CAAC,YAAY,CAAC;wBAC3G,SAAS,EAAE,aAAa;qBACzB,CAAC,CACH,CAAC;oBACF,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC3B,MAAM;gBACR,CAAC;gBACD,KAAK,kBAAkB,CAAC,WAAW;oBACjC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAiC,CAAC,CAAC;oBAC/D,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC3B,MAAM;gBACR,KAAK,kBAAkB,CAAC,YAAY,CAAC,CAAC,CAAC;oBACrC,4GAA4G;oBAC5G,MAAM,IAAI,GAAG,KAAK,CAAC,QAAwG,CAAC;oBAC5H,IAAI,IAAI,EAAE,aAAa,EAAE,CAAC;wBACxB,YAAY,CAAC,IAAI,CACf,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE;4BAC9B,UAAU,EAAE,IAAI,CAAC,UAAU;4BAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;4BACrB,KAAK,EAAE,KAAK,CAAC,OAAO;4BACpB,GAAG,EAAE,IAAI,CAAC,GAAG;4BACb,YAAY,EAAE,OAAO;4BACrB,SAAS,EAAE,aAAa;yBACzB,CAAC,CACH,CAAC;wBACF,aAAa,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;oBAC7B,CAAC;oBACD,MAAM;gBACR,CAAC;gBACD;oBACE,MAAM;YACV,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;QACD,KAAK,EAAE,CAAC;QACR,KAAK,GAAG,IAAI,CAAC;QACb,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC;YACnB,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACnC,CAAC;aAAM,CAAC;YACN,IAAI,CAAC;gBACH,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,CAAC;YAAC,OAAO,OAAO,EAAE,CAAC;gBACjB,qDAAqD;gBACrD,MAAM,EAAE,KAAK,EAAE,CAAC;gBAChB,MAAM,OAAO,CAAC;YAChB,CAAC;YACD,MAAM,EAAE,MAAM,EAAE,CAAC;YACjB,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;YAChD,IAAI,cAAc,EAAE,OAAO,EAAE,CAAC;gBAC5B,WAAW,CAAC,cAAc,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;gBAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;gBAC5B,IAAI,KAAK;oBAAE,WAAW,CAAC,cAAc,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnB,KAAK,EAAE,CAAC;QACR,KAAK,GAAG,IAAI,CAAC;QACb,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QACjC,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YACH,qFAAqF;YACrF,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,KAAK,EAAE,CAAC;gBACR,MAAM,EAAE,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;YACnC,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;YAC7B,IAAI,KAAK,CAAC,WAAW,GAAG,CAAC,IAAI,KAAK,CAAC,YAAY,GAAG,CAAC,IAAI,KAAK,CAAC,gBAAgB,GAAG,CAAC;gBAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACvG,4EAA4E;YAC5E,6EAA6E;YAC7E,oEAAoE;YACpE,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAClC,CAAC;gBAAS,CAAC;YACT,+DAA+D;YAC/D,IAAI,UAAU;gBAAE,KAAK,UAAU,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACzD,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;AACH,CAAC;AAED,oHAAoH;AACpH,SAAS,eAAe,CAAC,MAAqB,EAAE,MAAe;IAC7D,MAAM,UAAU,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC;IAC7C,IAAI,GAAG,GAAY,UAAU,CAAC;IAC9B,IAAI,UAAU,KAAK,SAAS,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC/D,MAAM,MAAM,GAAG,OAAO,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC3E,IAAI,CAAC;YACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC3B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,qBAAqB,CAC7B,0EAA0E,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAC7H,MAAM,CACP,CAAC;QACJ,CAAC;IACH,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAClB,MAAM,IAAI,qBAAqB,CAAC,4DAA4D,EAAE,MAAM,CAAC,IAAI,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3H,CAAC;IACD,OAAO,IAAI,CAAC,IAAI,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,IAAoB,EACpB,KAAqB,EACrB,IAAoB;IAEpB,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAChG,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC;IACnC,IAAI,MAAe,CAAC;IACpB,MAAM,OAAO,GAAmB,MAAM;QACpC,CAAC,CAAC;YACE,GAAG,IAAI;YACP,WAAW,EAAE,GAAG,EAAE;gBAChB,MAAM,GAAG,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC3C,CAAC;SACF;QACH,CAAC,CAAC,IAAI,CAAC;IACT,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACrD,IAAI,QAAQ,GAA+B,EAAE,CAAC;IAC9C,SAAS,CAAC;QACR,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;YACtB,MAAM;QACR,CAAC;IACH,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC;IAC/B,IAAI,KAAK;QAAE,MAAM,KAAK,CAAC;IACvB,MAAM,MAAM,GAAG,MAAM,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;IACrD,IAAI,CAAC,MAAM;QAAE,OAAO,MAAM,CAAC;IAC3B,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,CAAC;AAC/B,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,aAAa,CAAC,IAAoB,EAAE,KAAqB,EAAE,IAAoB;IAC7F,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,EAAE,gBAAgB,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,EAAE,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAChG,+EAA+E;IAC/E,yEAAyE;IACzE,mDAAmD;IACnD,MAAM,IAAI,GAAG,IAAI,eAAe,EAAE,CAAC;IACnC,MAAM,YAAY,GAAG,GAAS,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;IAC9C,IAAI,IAAI,CAAC,WAAW,EAAE,OAAO;QAAE,IAAI,CAAC,KAAK,EAAE,CAAC;;QACvC,IAAI,CAAC,WAAW,EAAE,gBAAgB,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/E,MAAM,GAAG,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,GAAG,IAAI,EAAE,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC;IACjG,MAAM,MAAM,GAAG,CAAC,KAAK,SAAS,CAAC;QAC7B,IAAI,CAAC;YACH,OAAO,KAAK,CAAC,CAAC,GAAG,CAAC;QACpB,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,WAAW,EAAE,mBAAmB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IACL,uHAAuH;IACvH,OAAO,iBAAiB,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACzE,CAAC"}
|
|
@@ -59,6 +59,14 @@ export interface BuildResponseFormatForProviderInputs {
|
|
|
59
59
|
* - unknown providers — `undefined`.
|
|
60
60
|
*/
|
|
61
61
|
export declare function buildResponseFormatForProvider(inputs: BuildResponseFormatForProviderInputs): Record<string, unknown> | undefined;
|
|
62
|
+
/**
|
|
63
|
+
* Whether a payload from {@link buildResponseFormatForProvider} carries the
|
|
64
|
+
* schema to the model. A strict `json_schema`, Anthropic's forced schema tool
|
|
65
|
+
* and Gemini's `responseSchema` (typed `json_object`, with the schema under
|
|
66
|
+
* `_gemini`) do; no payload, the loose `json_object` mode and any other shape
|
|
67
|
+
* do not, so the schema has to ride the prompt.
|
|
68
|
+
*/
|
|
69
|
+
export declare function responseFormatCarriesSchema(responseFormat: Record<string, unknown> | undefined): boolean;
|
|
62
70
|
/**
|
|
63
71
|
* Compact label for a structured-output payload shape, used by the
|
|
64
72
|
* `fallback_fired` log line (`rebuiltResponseFormatType`) as the live
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responseFormatForProvider.d.ts","sourceRoot":"","sources":["../../../src/api/runtime/responseFormatForProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAQnC;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,aAAoC,CAAC;AAErE,yDAAyD;AACzD,MAAM,WAAW,oCAAoC;IACnD,4EAA4E;IAC5E,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,mEAAmE;IACnE,eAAe,EAAE,OAAO,CAAC;IACzB,uDAAuD;IACvD,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,oCAAoC,GAC3C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CA2CrC;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAClD,MAAM,CAKR"}
|
|
1
|
+
{"version":3,"file":"responseFormatForProvider.d.ts","sourceRoot":"","sources":["../../../src/api/runtime/responseFormatForProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AAQnC;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,aAAoC,CAAC;AAErE,yDAAyD;AACzD,MAAM,WAAW,oCAAoC;IACnD,4EAA4E;IAC5E,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;OAKG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpC,mEAAmE;IACnE,eAAe,EAAE,OAAO,CAAC;IACzB,uDAAuD;IACvD,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;CAChC;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,8BAA8B,CAC5C,MAAM,EAAE,oCAAoC,GAC3C,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,CA2CrC;AAED;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CACzC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAClD,OAAO,CAOT;AAED;;;;;;;;GAQG;AACH,wBAAgB,2BAA2B,CACzC,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,GAClD,MAAM,CAKR"}
|
|
@@ -74,6 +74,20 @@ export function buildResponseFormatForProvider(inputs) {
|
|
|
74
74
|
// rides the system prompt and caller-side Zod validation still runs.
|
|
75
75
|
return undefined;
|
|
76
76
|
}
|
|
77
|
+
/**
|
|
78
|
+
* Whether a payload from {@link buildResponseFormatForProvider} carries the
|
|
79
|
+
* schema to the model. A strict `json_schema`, Anthropic's forced schema tool
|
|
80
|
+
* and Gemini's `responseSchema` (typed `json_object`, with the schema under
|
|
81
|
+
* `_gemini`) do; no payload, the loose `json_object` mode and any other shape
|
|
82
|
+
* do not, so the schema has to ride the prompt.
|
|
83
|
+
*/
|
|
84
|
+
export function responseFormatCarriesSchema(responseFormat) {
|
|
85
|
+
if (!responseFormat)
|
|
86
|
+
return false;
|
|
87
|
+
return (responseFormat.type === 'json_schema' ||
|
|
88
|
+
responseFormat._agentosUseToolForStructuredOutput === true ||
|
|
89
|
+
responseFormat._gemini !== undefined);
|
|
90
|
+
}
|
|
77
91
|
/**
|
|
78
92
|
* Compact label for a structured-output payload shape, used by the
|
|
79
93
|
* `fallback_fired` log line (`rebuiltResponseFormatType`) as the live
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"responseFormatForProvider.js","sourceRoot":"","sources":["../../../src/api/runtime/responseFormatForProvider.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,sBAAsB,EACtB,mCAAmC,GACpC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AACzF,OAAO,EAAE,6BAA6B,EAAE,MAAM,sDAAsD,CAAC;AAErG;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;AAqBrE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,8BAA8B,CAC5C,MAA4C;IAE5C,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAChF,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,sBAAsB,CAAC,UAAU,CAAC;YACvC,CAAC,CAAC,mCAAmC,CAAC,UAAU,EAAE,UAAU,CAAC;YAC7D,CAAC,CAAC,EAAE,IAAI,EAAE,aAAsB,EAAE,CAAC;IACvC,CAAC;IACD,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;QAC/B,wEAAwE;QACxE,yEAAyE;QACzE,sDAAsD;QACtD,OAAO,6BAA6B,CAAC,OAAO,CAAC;YAC3C,CAAC,CAAC,mBAAmB,CAAC;gBAClB,QAAQ,EAAE,UAAU;gBACpB,MAAM,EAAE,eAAe;gBACvB,UAAU,EAAE,UAAU,IAAI,UAAU;aACrC,CAAC;YACJ,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IACD,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,mBAAmB,CAAC;YACzB,QAAQ,EAAE,UAAU;YACpB,MAAM,EAAE,eAAe;YACvB,UAAU,EAAE,UAAU,IAAI,UAAU;SACrC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;QAChC,yEAAyE;QACzE,yEAAyE;QACzE,uDAAuD;QACvD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;QAChC,OAAO,sBAAsB,CAAC,UAAU,CAAC;YACvC,CAAC,CAAC,mCAAmC,CAAC,UAAU,EAAE,UAAU,CAAC;YAC7D,CAAC,CAAC,EAAE,IAAI,EAAE,aAAsB,EAAE,CAAC;IACvC,CAAC;IACD,IAAI,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,OAAO,EAAE,IAAI,EAAE,aAAsB,EAAE,CAAC;IAC1C,CAAC;IACD,uEAAuE;IACvE,qEAAqE;IACrE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,2BAA2B,CACzC,cAAmD;IAEnD,IAAI,CAAC,cAAc;QAAE,OAAO,MAAM,CAAC;IACnC,IAAI,cAAc,CAAC,kCAAkC;QAAE,OAAO,gBAAgB,CAAC;IAC/E,IAAI,cAAc,CAAC,OAAO;QAAE,OAAO,wBAAwB,CAAC;IAC5D,OAAO,OAAO,cAAc,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AACnF,CAAC"}
|
|
1
|
+
{"version":3,"file":"responseFormatForProvider.js","sourceRoot":"","sources":["../../../src/api/runtime/responseFormatForProvider.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,sBAAsB,EACtB,mCAAmC,GACpC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,oDAAoD,CAAC;AACzF,OAAO,EAAE,6BAA6B,EAAE,MAAM,sDAAsD,CAAC;AAErG;;;;GAIG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;AAqBrE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAM,UAAU,8BAA8B,CAC5C,MAA4C;IAE5C,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC;IAChF,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,sBAAsB,CAAC,UAAU,CAAC;YACvC,CAAC,CAAC,mCAAmC,CAAC,UAAU,EAAE,UAAU,CAAC;YAC7D,CAAC,CAAC,EAAE,IAAI,EAAE,aAAsB,EAAE,CAAC;IACvC,CAAC;IACD,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;QAC/B,wEAAwE;QACxE,yEAAyE;QACzE,sDAAsD;QACtD,OAAO,6BAA6B,CAAC,OAAO,CAAC;YAC3C,CAAC,CAAC,mBAAmB,CAAC;gBAClB,QAAQ,EAAE,UAAU;gBACpB,MAAM,EAAE,eAAe;gBACvB,UAAU,EAAE,UAAU,IAAI,UAAU;aACrC,CAAC;YACJ,CAAC,CAAC,SAAS,CAAC;IAChB,CAAC;IACD,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,mBAAmB,CAAC;YACzB,QAAQ,EAAE,UAAU;YACpB,MAAM,EAAE,eAAe;YACvB,UAAU,EAAE,UAAU,IAAI,UAAU;SACrC,CAAC,CAAC;IACL,CAAC;IACD,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;QAChC,yEAAyE;QACzE,yEAAyE;QACzE,uDAAuD;QACvD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,UAAU,KAAK,YAAY,EAAE,CAAC;QAChC,OAAO,sBAAsB,CAAC,UAAU,CAAC;YACvC,CAAC,CAAC,mCAAmC,CAAC,UAAU,EAAE,UAAU,CAAC;YAC7D,CAAC,CAAC,EAAE,IAAI,EAAE,aAAsB,EAAE,CAAC;IACvC,CAAC;IACD,IAAI,mBAAmB,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;QACxC,OAAO,EAAE,IAAI,EAAE,aAAsB,EAAE,CAAC;IAC1C,CAAC;IACD,uEAAuE;IACvE,qEAAqE;IACrE,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,2BAA2B,CACzC,cAAmD;IAEnD,IAAI,CAAC,cAAc;QAAE,OAAO,KAAK,CAAC;IAClC,OAAO,CACL,cAAc,CAAC,IAAI,KAAK,aAAa;QACrC,cAAc,CAAC,kCAAkC,KAAK,IAAI;QAC1D,cAAc,CAAC,OAAO,KAAK,SAAS,CACrC,CAAC;AACJ,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,2BAA2B,CACzC,cAAmD;IAEnD,IAAI,CAAC,cAAc;QAAE,OAAO,MAAM,CAAC;IACnC,IAAI,cAAc,CAAC,kCAAkC;QAAE,OAAO,gBAAgB,CAAC;IAC/E,IAAI,cAAc,CAAC,OAAO;QAAE,OAAO,wBAAwB,CAAC;IAC5D,OAAO,OAAO,cAAc,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;AACnF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GMI.d.ts","sourceRoot":"","sources":["../../../src/cognition/substrate/GMI.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"GMI.d.ts","sourceRoot":"","sources":["../../../src/cognition/substrate/GMI.ts"],"names":[],"mappings":"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"}
|
|
@@ -1056,6 +1056,8 @@ export class GMI {
|
|
|
1056
1056
|
// A schema travels to the gateway, which lowers it per hop (D9); it is not a provider option.
|
|
1057
1057
|
const responseSchema = turnOptions.responseSchema ?? structuredReply?.zod;
|
|
1058
1058
|
const schemaName = turnOptions.schemaName ?? (structuredReply && responseSchema === structuredReply.zod ? structuredReply.name : undefined);
|
|
1059
|
+
// The structured reply's instruction is in the system prompt already; the gateway adds none for its schema.
|
|
1060
|
+
const schemaInPrompt = responseSchema !== undefined && responseSchema === structuredReply?.zod;
|
|
1059
1061
|
// The gateway's route: the model asked for, the last user message (its text
|
|
1060
1062
|
// is the router's task hint: the text parts of a multimodal message, and on
|
|
1061
1063
|
// a continuation the message being answered, never the continuation's own
|
|
@@ -1173,7 +1175,7 @@ export class GMI {
|
|
|
1173
1175
|
let attempt;
|
|
1174
1176
|
let attemptOutcome;
|
|
1175
1177
|
if (gateway && resolution) {
|
|
1176
|
-
const gatewayAttempt = gateway.stream(resolution, sendMessages, llmOptions, responseSchema, schemaName);
|
|
1178
|
+
const gatewayAttempt = gateway.stream(resolution, sendMessages, llmOptions, responseSchema, schemaName, schemaInPrompt);
|
|
1177
1179
|
attempt = gatewayAttempt;
|
|
1178
1180
|
attemptOutcome = gatewayAttempt.outcome;
|
|
1179
1181
|
}
|