@terreno/ai 0.18.0 → 0.19.0
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/service/aiService.d.ts +17 -2
- package/dist/service/aiService.js +326 -8
- package/dist/service/index.d.ts +5 -1
- package/dist/service/index.js +8 -1
- package/dist/service/parseAiJson.d.ts +33 -0
- package/dist/service/parseAiJson.js +180 -0
- package/dist/service/prompts.d.ts +2 -0
- package/dist/service/prompts.js +4 -1
- package/dist/types/index.d.ts +36 -1
- package/dist/types/index.js +3 -0
- package/package.json +3 -3
- package/src/service/aiService.test.ts +142 -1
- package/src/service/aiService.ts +320 -2
- package/src/service/index.ts +5 -0
- package/src/service/parseAiJson.test.ts +76 -0
- package/src/service/parseAiJson.ts +214 -0
- package/src/service/prompts.ts +5 -0
- package/src/service/vertex.test.ts +69 -0
- package/src/types/index.ts +41 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type { LanguageModel, ModelMessage } from "ai";
|
|
2
|
-
import type { AIServiceOptions, GenerateChatStreamOptions, GenerateStreamOptions, GenerateTextOptions, GptHistoryPrompt, RemixOptions, SummaryOptions, TranslateOptions } from "../types";
|
|
1
|
+
import type { JSONValue, LanguageModel, ModelMessage } from "ai";
|
|
2
|
+
import type { AIServiceOptions, GenerateChatStreamOptions, GenerateJsonArrayOptions, GenerateJsonObjectOptions, GenerateJsonValueOptions, GenerateStreamOptions, GenerateTextOptions, GptHistoryPrompt, RemixOptions, SummaryOptions, TranslateOptions } from "../types";
|
|
3
3
|
export declare const TemperaturePresets: {
|
|
4
4
|
readonly BALANCED: 0.7;
|
|
5
5
|
readonly DEFAULT: 1;
|
|
@@ -11,10 +11,25 @@ export declare const TemperaturePresets: {
|
|
|
11
11
|
export declare class AIService {
|
|
12
12
|
readonly model: LanguageModel;
|
|
13
13
|
readonly defaultTemperature: number;
|
|
14
|
+
private structuredJsonModel?;
|
|
14
15
|
constructor({ model, defaultTemperature }: AIServiceOptions);
|
|
15
16
|
get modelId(): string;
|
|
17
|
+
private getModelForStructuredJson;
|
|
18
|
+
private describeStructuredGenerationError;
|
|
19
|
+
private extractRawModelTextFromStructuredError;
|
|
20
|
+
private extractFinishReasonFromStructuredError;
|
|
21
|
+
private logStructuredJsonFailure;
|
|
16
22
|
private logRequest;
|
|
17
23
|
generateText(options: GenerateTextOptions): Promise<string>;
|
|
24
|
+
/** Any JSON value (object, array, primitive, or null) via the AI SDK `Output.json()` parser. */
|
|
25
|
+
generateJsonValue(options: GenerateJsonValueOptions): Promise<JSONValue>;
|
|
26
|
+
/** Typed object from a Zod schema, `jsonSchema(...)`, or other `FlexibleSchema` (`Output.object()`). */
|
|
27
|
+
generateJsonObject<OBJECT>(options: GenerateJsonObjectOptions<OBJECT>): Promise<OBJECT>;
|
|
28
|
+
/**
|
|
29
|
+
* Typed array: the model is steered to emit `{"elements":[...]}`; the SDK validates each entry
|
|
30
|
+
* and this method returns the plain array (`Output.array()`).
|
|
31
|
+
*/
|
|
32
|
+
generateJsonArray<ELEMENT>(options: GenerateJsonArrayOptions<ELEMENT>): Promise<Array<ELEMENT>>;
|
|
18
33
|
generateTextStream(options: GenerateStreamOptions): AsyncGenerator<string>;
|
|
19
34
|
generateRemix(options: RemixOptions): Promise<string>;
|
|
20
35
|
generateSummary(options: SummaryOptions): Promise<string>;
|
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
14
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
15
|
return new (P || (P = Promise))(function (resolve, reject) {
|
|
@@ -71,6 +82,7 @@ exports.AIService = exports.TemperaturePresets = void 0;
|
|
|
71
82
|
var api_1 = require("@terreno/api");
|
|
72
83
|
var ai_1 = require("ai");
|
|
73
84
|
var aiRequest_1 = require("../models/aiRequest");
|
|
85
|
+
var parseAiJson_1 = require("./parseAiJson");
|
|
74
86
|
var prompts_1 = require("./prompts");
|
|
75
87
|
exports.TemperaturePresets = {
|
|
76
88
|
BALANCED: 0.7,
|
|
@@ -80,6 +92,48 @@ exports.TemperaturePresets = {
|
|
|
80
92
|
LOW: 0.3,
|
|
81
93
|
MAXIMUM: 2.0,
|
|
82
94
|
};
|
|
95
|
+
/**
|
|
96
|
+
* Wraps a language model so non-streaming `doGenerate` text parts are normalized via
|
|
97
|
+
* {@link normalizeLlmJsonTextForStructuredOutput} (fences, preamble, balanced slice, light repairs)
|
|
98
|
+
* before Vercel `Output.*` parsing.
|
|
99
|
+
*/
|
|
100
|
+
var withStrippedJsonFencesModel = function (model) {
|
|
101
|
+
if (typeof model === "string") {
|
|
102
|
+
return model;
|
|
103
|
+
}
|
|
104
|
+
return new Proxy(model, {
|
|
105
|
+
get: function (target, prop, receiver) {
|
|
106
|
+
var _this = this;
|
|
107
|
+
if (prop === "doGenerate") {
|
|
108
|
+
var original = Reflect.get(target, prop, receiver);
|
|
109
|
+
if (typeof original !== "function") {
|
|
110
|
+
return original;
|
|
111
|
+
}
|
|
112
|
+
var boundGenerate_1 = original;
|
|
113
|
+
return function (options) { return __awaiter(_this, void 0, void 0, function () {
|
|
114
|
+
var result;
|
|
115
|
+
return __generator(this, function (_a) {
|
|
116
|
+
switch (_a.label) {
|
|
117
|
+
case 0: return [4 /*yield*/, Promise.resolve(boundGenerate_1.call(target, options))];
|
|
118
|
+
case 1:
|
|
119
|
+
result = _a.sent();
|
|
120
|
+
if (!(result === null || result === void 0 ? void 0 : result.content) || !Array.isArray(result.content)) {
|
|
121
|
+
return [2 /*return*/, result];
|
|
122
|
+
}
|
|
123
|
+
return [2 /*return*/, __assign(__assign({}, result), { content: result.content.map(function (part) {
|
|
124
|
+
if (part.type !== "text" || typeof part.text !== "string") {
|
|
125
|
+
return part;
|
|
126
|
+
}
|
|
127
|
+
return __assign(__assign({}, part), { text: (0, parseAiJson_1.normalizeLlmJsonTextForStructuredOutput)(part.text) });
|
|
128
|
+
}) })];
|
|
129
|
+
}
|
|
130
|
+
});
|
|
131
|
+
}); };
|
|
132
|
+
}
|
|
133
|
+
return Reflect.get(target, prop, receiver);
|
|
134
|
+
},
|
|
135
|
+
});
|
|
136
|
+
};
|
|
83
137
|
var getModelId = function (model) {
|
|
84
138
|
var _a;
|
|
85
139
|
if (typeof model === "string") {
|
|
@@ -100,6 +154,88 @@ var AIService = /** @class */ (function () {
|
|
|
100
154
|
enumerable: false,
|
|
101
155
|
configurable: true
|
|
102
156
|
});
|
|
157
|
+
AIService.prototype.getModelForStructuredJson = function () {
|
|
158
|
+
if (!this.structuredJsonModel) {
|
|
159
|
+
this.structuredJsonModel = withStrippedJsonFencesModel(this.model);
|
|
160
|
+
}
|
|
161
|
+
return this.structuredJsonModel;
|
|
162
|
+
};
|
|
163
|
+
AIService.prototype.describeStructuredGenerationError = function (error) {
|
|
164
|
+
if (error instanceof Error) {
|
|
165
|
+
var base = "".concat(error.name, ": ").concat(error.message);
|
|
166
|
+
if (error.cause instanceof Error) {
|
|
167
|
+
return "".concat(base, " | cause: ").concat(error.cause.name, ": ").concat(error.cause.message);
|
|
168
|
+
}
|
|
169
|
+
return base;
|
|
170
|
+
}
|
|
171
|
+
return String(error);
|
|
172
|
+
};
|
|
173
|
+
AIService.prototype.extractRawModelTextFromStructuredError = function (error) {
|
|
174
|
+
if (ai_1.NoObjectGeneratedError.isInstance(error) && typeof error.text === "string") {
|
|
175
|
+
return error.text;
|
|
176
|
+
}
|
|
177
|
+
if (error instanceof Error && "text" in error) {
|
|
178
|
+
var t = error.text;
|
|
179
|
+
if (typeof t === "string") {
|
|
180
|
+
return t;
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
return undefined;
|
|
184
|
+
};
|
|
185
|
+
AIService.prototype.extractFinishReasonFromStructuredError = function (error) {
|
|
186
|
+
if (ai_1.NoObjectGeneratedError.isInstance(error) && error.finishReason) {
|
|
187
|
+
return error.finishReason;
|
|
188
|
+
}
|
|
189
|
+
return undefined;
|
|
190
|
+
};
|
|
191
|
+
AIService.prototype.logStructuredJsonFailure = function (params) {
|
|
192
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
193
|
+
var rawText, responseForLog, errorDescription, finishReason, errorStack;
|
|
194
|
+
return __generator(this, function (_a) {
|
|
195
|
+
switch (_a.label) {
|
|
196
|
+
case 0:
|
|
197
|
+
rawText = this.extractRawModelTextFromStructuredError(params.error);
|
|
198
|
+
responseForLog = rawText !== undefined && rawText.length > 0
|
|
199
|
+
? rawText
|
|
200
|
+
: "(no raw model text captured on this error)";
|
|
201
|
+
errorDescription = this.describeStructuredGenerationError(params.error);
|
|
202
|
+
finishReason = this.extractFinishReasonFromStructuredError(params.error);
|
|
203
|
+
errorStack = params.error instanceof Error && typeof params.error.stack === "string"
|
|
204
|
+
? params.error.stack.length > 8000
|
|
205
|
+
? "".concat(params.error.stack.slice(0, 8000), "\u2026")
|
|
206
|
+
: params.error.stack
|
|
207
|
+
: undefined;
|
|
208
|
+
api_1.logger.error("AIService structured JSON generation failed", {
|
|
209
|
+
aiModel: getModelId(this.model),
|
|
210
|
+
error: errorDescription,
|
|
211
|
+
finishReason: finishReason,
|
|
212
|
+
prompt: params.prompt,
|
|
213
|
+
requestType: params.requestType,
|
|
214
|
+
response: rawText !== null && rawText !== void 0 ? rawText : "",
|
|
215
|
+
system: params.system,
|
|
216
|
+
});
|
|
217
|
+
return [4 /*yield*/, this.logRequest({
|
|
218
|
+
aiModel: getModelId(this.model),
|
|
219
|
+
error: errorDescription,
|
|
220
|
+
metadata: {
|
|
221
|
+
errorStack: errorStack,
|
|
222
|
+
finishReason: finishReason,
|
|
223
|
+
rawModelTextCaptured: Boolean(rawText && rawText.length > 0),
|
|
224
|
+
system: params.system,
|
|
225
|
+
},
|
|
226
|
+
prompt: params.prompt,
|
|
227
|
+
requestType: params.requestType,
|
|
228
|
+
response: responseForLog,
|
|
229
|
+
responseTime: params.responseTime,
|
|
230
|
+
userId: params.userId,
|
|
231
|
+
})];
|
|
232
|
+
case 1:
|
|
233
|
+
_a.sent();
|
|
234
|
+
return [2 /*return*/];
|
|
235
|
+
}
|
|
236
|
+
});
|
|
237
|
+
});
|
|
238
|
+
};
|
|
103
239
|
AIService.prototype.logRequest = function (params) {
|
|
104
240
|
return __awaiter(this, void 0, void 0, function () {
|
|
105
241
|
var _a;
|
|
@@ -173,9 +309,191 @@ var AIService = /** @class */ (function () {
|
|
|
173
309
|
});
|
|
174
310
|
});
|
|
175
311
|
};
|
|
312
|
+
/** Any JSON value (object, array, primitive, or null) via the AI SDK `Output.json()` parser. */
|
|
313
|
+
AIService.prototype.generateJsonValue = function (options) {
|
|
314
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
315
|
+
var maxOutputTokens, outputDescription, outputName, prompt, systemPrompt, temperature, userId, startTime, system, result, responseTime, error_2, responseTime;
|
|
316
|
+
var _a;
|
|
317
|
+
return __generator(this, function (_b) {
|
|
318
|
+
switch (_b.label) {
|
|
319
|
+
case 0:
|
|
320
|
+
maxOutputTokens = options.maxOutputTokens, outputDescription = options.outputDescription, outputName = options.outputName, prompt = options.prompt, systemPrompt = options.systemPrompt, temperature = options.temperature, userId = options.userId;
|
|
321
|
+
startTime = Date.now();
|
|
322
|
+
system = systemPrompt !== null && systemPrompt !== void 0 ? systemPrompt : prompts_1.JSON_VALUE_SYSTEM_PROMPT;
|
|
323
|
+
_b.label = 1;
|
|
324
|
+
case 1:
|
|
325
|
+
_b.trys.push([1, 4, , 6]);
|
|
326
|
+
return [4 /*yield*/, (0, ai_1.generateText)({
|
|
327
|
+
experimental_telemetry: { functionId: "generate-json-value", isEnabled: true },
|
|
328
|
+
maxOutputTokens: maxOutputTokens,
|
|
329
|
+
model: this.getModelForStructuredJson(),
|
|
330
|
+
output: ai_1.Output.json({ description: outputDescription, name: outputName }),
|
|
331
|
+
prompt: prompt,
|
|
332
|
+
system: system,
|
|
333
|
+
temperature: temperature !== null && temperature !== void 0 ? temperature : exports.TemperaturePresets.DETERMINISTIC,
|
|
334
|
+
})];
|
|
335
|
+
case 2:
|
|
336
|
+
result = _b.sent();
|
|
337
|
+
responseTime = Date.now() - startTime;
|
|
338
|
+
return [4 /*yield*/, this.logRequest({
|
|
339
|
+
aiModel: getModelId(this.model),
|
|
340
|
+
prompt: prompt,
|
|
341
|
+
requestType: "json_value",
|
|
342
|
+
response: JSON.stringify(result.output),
|
|
343
|
+
responseTime: responseTime,
|
|
344
|
+
tokensUsed: (_a = result.usage) === null || _a === void 0 ? void 0 : _a.totalTokens,
|
|
345
|
+
userId: userId,
|
|
346
|
+
})];
|
|
347
|
+
case 3:
|
|
348
|
+
_b.sent();
|
|
349
|
+
return [2 /*return*/, result.output];
|
|
350
|
+
case 4:
|
|
351
|
+
error_2 = _b.sent();
|
|
352
|
+
responseTime = Date.now() - startTime;
|
|
353
|
+
return [4 /*yield*/, this.logStructuredJsonFailure({
|
|
354
|
+
error: error_2,
|
|
355
|
+
prompt: prompt,
|
|
356
|
+
requestType: "json_value",
|
|
357
|
+
responseTime: responseTime,
|
|
358
|
+
system: system,
|
|
359
|
+
userId: userId,
|
|
360
|
+
})];
|
|
361
|
+
case 5:
|
|
362
|
+
_b.sent();
|
|
363
|
+
throw error_2;
|
|
364
|
+
case 6: return [2 /*return*/];
|
|
365
|
+
}
|
|
366
|
+
});
|
|
367
|
+
});
|
|
368
|
+
};
|
|
369
|
+
/** Typed object from a Zod schema, `jsonSchema(...)`, or other `FlexibleSchema` (`Output.object()`). */
|
|
370
|
+
AIService.prototype.generateJsonObject = function (options) {
|
|
371
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
372
|
+
var maxOutputTokens, prompt, schema, schemaDescription, schemaName, systemPrompt, temperature, userId, startTime, system, result, responseTime, error_3, responseTime;
|
|
373
|
+
var _a;
|
|
374
|
+
return __generator(this, function (_b) {
|
|
375
|
+
switch (_b.label) {
|
|
376
|
+
case 0:
|
|
377
|
+
maxOutputTokens = options.maxOutputTokens, prompt = options.prompt, schema = options.schema, schemaDescription = options.schemaDescription, schemaName = options.schemaName, systemPrompt = options.systemPrompt, temperature = options.temperature, userId = options.userId;
|
|
378
|
+
startTime = Date.now();
|
|
379
|
+
system = systemPrompt !== null && systemPrompt !== void 0 ? systemPrompt : prompts_1.JSON_VALUE_SYSTEM_PROMPT;
|
|
380
|
+
_b.label = 1;
|
|
381
|
+
case 1:
|
|
382
|
+
_b.trys.push([1, 4, , 6]);
|
|
383
|
+
return [4 /*yield*/, (0, ai_1.generateText)({
|
|
384
|
+
experimental_telemetry: { functionId: "generate-json-object", isEnabled: true },
|
|
385
|
+
maxOutputTokens: maxOutputTokens,
|
|
386
|
+
model: this.getModelForStructuredJson(),
|
|
387
|
+
output: ai_1.Output.object({
|
|
388
|
+
description: schemaDescription,
|
|
389
|
+
name: schemaName,
|
|
390
|
+
schema: schema,
|
|
391
|
+
}),
|
|
392
|
+
prompt: prompt,
|
|
393
|
+
system: system,
|
|
394
|
+
temperature: temperature !== null && temperature !== void 0 ? temperature : exports.TemperaturePresets.DETERMINISTIC,
|
|
395
|
+
})];
|
|
396
|
+
case 2:
|
|
397
|
+
result = _b.sent();
|
|
398
|
+
responseTime = Date.now() - startTime;
|
|
399
|
+
return [4 /*yield*/, this.logRequest({
|
|
400
|
+
aiModel: getModelId(this.model),
|
|
401
|
+
prompt: prompt,
|
|
402
|
+
requestType: "json_object",
|
|
403
|
+
response: JSON.stringify(result.output),
|
|
404
|
+
responseTime: responseTime,
|
|
405
|
+
tokensUsed: (_a = result.usage) === null || _a === void 0 ? void 0 : _a.totalTokens,
|
|
406
|
+
userId: userId,
|
|
407
|
+
})];
|
|
408
|
+
case 3:
|
|
409
|
+
_b.sent();
|
|
410
|
+
return [2 /*return*/, result.output];
|
|
411
|
+
case 4:
|
|
412
|
+
error_3 = _b.sent();
|
|
413
|
+
responseTime = Date.now() - startTime;
|
|
414
|
+
return [4 /*yield*/, this.logStructuredJsonFailure({
|
|
415
|
+
error: error_3,
|
|
416
|
+
prompt: prompt,
|
|
417
|
+
requestType: "json_object",
|
|
418
|
+
responseTime: responseTime,
|
|
419
|
+
system: system,
|
|
420
|
+
userId: userId,
|
|
421
|
+
})];
|
|
422
|
+
case 5:
|
|
423
|
+
_b.sent();
|
|
424
|
+
throw error_3;
|
|
425
|
+
case 6: return [2 /*return*/];
|
|
426
|
+
}
|
|
427
|
+
});
|
|
428
|
+
});
|
|
429
|
+
};
|
|
430
|
+
/**
|
|
431
|
+
* Typed array: the model is steered to emit `{"elements":[...]}`; the SDK validates each entry
|
|
432
|
+
* and this method returns the plain array (`Output.array()`).
|
|
433
|
+
*/
|
|
434
|
+
AIService.prototype.generateJsonArray = function (options) {
|
|
435
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
436
|
+
var element, maxOutputTokens, outputDescription, outputName, prompt, systemPrompt, temperature, userId, startTime, system, result, responseTime, error_4, responseTime;
|
|
437
|
+
var _a;
|
|
438
|
+
return __generator(this, function (_b) {
|
|
439
|
+
switch (_b.label) {
|
|
440
|
+
case 0:
|
|
441
|
+
element = options.element, maxOutputTokens = options.maxOutputTokens, outputDescription = options.outputDescription, outputName = options.outputName, prompt = options.prompt, systemPrompt = options.systemPrompt, temperature = options.temperature, userId = options.userId;
|
|
442
|
+
startTime = Date.now();
|
|
443
|
+
system = systemPrompt !== null && systemPrompt !== void 0 ? systemPrompt : prompts_1.JSON_VALUE_SYSTEM_PROMPT;
|
|
444
|
+
_b.label = 1;
|
|
445
|
+
case 1:
|
|
446
|
+
_b.trys.push([1, 4, , 6]);
|
|
447
|
+
return [4 /*yield*/, (0, ai_1.generateText)({
|
|
448
|
+
experimental_telemetry: { functionId: "generate-json-array", isEnabled: true },
|
|
449
|
+
maxOutputTokens: maxOutputTokens,
|
|
450
|
+
model: this.getModelForStructuredJson(),
|
|
451
|
+
output: ai_1.Output.array({
|
|
452
|
+
description: outputDescription,
|
|
453
|
+
element: element,
|
|
454
|
+
name: outputName,
|
|
455
|
+
}),
|
|
456
|
+
prompt: prompt,
|
|
457
|
+
system: system,
|
|
458
|
+
temperature: temperature !== null && temperature !== void 0 ? temperature : exports.TemperaturePresets.DETERMINISTIC,
|
|
459
|
+
})];
|
|
460
|
+
case 2:
|
|
461
|
+
result = _b.sent();
|
|
462
|
+
responseTime = Date.now() - startTime;
|
|
463
|
+
return [4 /*yield*/, this.logRequest({
|
|
464
|
+
aiModel: getModelId(this.model),
|
|
465
|
+
prompt: prompt,
|
|
466
|
+
requestType: "json_array",
|
|
467
|
+
response: JSON.stringify(result.output),
|
|
468
|
+
responseTime: responseTime,
|
|
469
|
+
tokensUsed: (_a = result.usage) === null || _a === void 0 ? void 0 : _a.totalTokens,
|
|
470
|
+
userId: userId,
|
|
471
|
+
})];
|
|
472
|
+
case 3:
|
|
473
|
+
_b.sent();
|
|
474
|
+
return [2 /*return*/, result.output];
|
|
475
|
+
case 4:
|
|
476
|
+
error_4 = _b.sent();
|
|
477
|
+
responseTime = Date.now() - startTime;
|
|
478
|
+
return [4 /*yield*/, this.logStructuredJsonFailure({
|
|
479
|
+
error: error_4,
|
|
480
|
+
prompt: prompt,
|
|
481
|
+
requestType: "json_array",
|
|
482
|
+
responseTime: responseTime,
|
|
483
|
+
system: system,
|
|
484
|
+
userId: userId,
|
|
485
|
+
})];
|
|
486
|
+
case 5:
|
|
487
|
+
_b.sent();
|
|
488
|
+
throw error_4;
|
|
489
|
+
case 6: return [2 /*return*/];
|
|
490
|
+
}
|
|
491
|
+
});
|
|
492
|
+
});
|
|
493
|
+
};
|
|
176
494
|
AIService.prototype.generateTextStream = function (options) {
|
|
177
495
|
return __asyncGenerator(this, arguments, function generateTextStream_1() {
|
|
178
|
-
var prompt, systemPrompt, temperature, maxOutputTokens, userId, startTime, fullResponse, result, _a, _b, _c, chunk, e_1_1, responseTime, usage,
|
|
496
|
+
var prompt, systemPrompt, temperature, maxOutputTokens, userId, startTime, fullResponse, result, _a, _b, _c, chunk, e_1_1, responseTime, usage, error_5, responseTime;
|
|
179
497
|
var _d, e_1, _e, _f;
|
|
180
498
|
return __generator(this, function (_g) {
|
|
181
499
|
switch (_g.label) {
|
|
@@ -249,11 +567,11 @@ var AIService = /** @class */ (function () {
|
|
|
249
567
|
_g.sent();
|
|
250
568
|
return [3 /*break*/, 20];
|
|
251
569
|
case 18:
|
|
252
|
-
|
|
570
|
+
error_5 = _g.sent();
|
|
253
571
|
responseTime = Date.now() - startTime;
|
|
254
572
|
return [4 /*yield*/, __await(this.logRequest({
|
|
255
573
|
aiModel: getModelId(this.model),
|
|
256
|
-
error:
|
|
574
|
+
error: error_5 instanceof Error ? error_5.message : String(error_5),
|
|
257
575
|
prompt: prompt,
|
|
258
576
|
requestType: "general",
|
|
259
577
|
responseTime: responseTime,
|
|
@@ -261,7 +579,7 @@ var AIService = /** @class */ (function () {
|
|
|
261
579
|
}))];
|
|
262
580
|
case 19:
|
|
263
581
|
_g.sent();
|
|
264
|
-
throw
|
|
582
|
+
throw error_5;
|
|
265
583
|
case 20: return [2 /*return*/];
|
|
266
584
|
}
|
|
267
585
|
});
|
|
@@ -372,7 +690,7 @@ var AIService = /** @class */ (function () {
|
|
|
372
690
|
};
|
|
373
691
|
AIService.prototype.generateChatStream = function (options) {
|
|
374
692
|
return __asyncGenerator(this, arguments, function generateChatStream_1() {
|
|
375
|
-
var messages, systemPrompt, tools, toolChoice, stopWhen, userId, startTime, fullResponse, promptText, result, _a, _b, _c, chunk, e_4_1, responseTime, usage,
|
|
693
|
+
var messages, systemPrompt, tools, toolChoice, stopWhen, userId, startTime, fullResponse, promptText, result, _a, _b, _c, chunk, e_4_1, responseTime, usage, error_6, responseTime;
|
|
376
694
|
var _d, e_4, _e, _f;
|
|
377
695
|
return __generator(this, function (_g) {
|
|
378
696
|
switch (_g.label) {
|
|
@@ -449,11 +767,11 @@ var AIService = /** @class */ (function () {
|
|
|
449
767
|
_g.sent();
|
|
450
768
|
return [3 /*break*/, 20];
|
|
451
769
|
case 18:
|
|
452
|
-
|
|
770
|
+
error_6 = _g.sent();
|
|
453
771
|
responseTime = Date.now() - startTime;
|
|
454
772
|
return [4 /*yield*/, __await(this.logRequest({
|
|
455
773
|
aiModel: getModelId(this.model),
|
|
456
|
-
error:
|
|
774
|
+
error: error_6 instanceof Error ? error_6.message : String(error_6),
|
|
457
775
|
prompt: promptText,
|
|
458
776
|
requestType: "general",
|
|
459
777
|
responseTime: responseTime,
|
|
@@ -461,7 +779,7 @@ var AIService = /** @class */ (function () {
|
|
|
461
779
|
}))];
|
|
462
780
|
case 19:
|
|
463
781
|
_g.sent();
|
|
464
|
-
throw
|
|
782
|
+
throw error_6;
|
|
465
783
|
case 20: return [2 /*return*/];
|
|
466
784
|
}
|
|
467
785
|
});
|
package/dist/service/index.d.ts
CHANGED
|
@@ -1,9 +1,13 @@
|
|
|
1
|
+
export type { FlexibleSchema, JSONValue } from "ai";
|
|
2
|
+
export { jsonSchema, Output } from "ai";
|
|
1
3
|
export { AIService, TemperaturePresets } from "./aiService";
|
|
2
4
|
export { FileStorageService } from "./fileStorage";
|
|
3
5
|
export type { ListGeminiApiModelsOptions } from "./gemini";
|
|
4
6
|
export { GEMINI_API_BASE_URL, listGeminiApiModels, normalizeGeminiModelId } from "./gemini";
|
|
5
7
|
export { MCPService } from "./mcpService";
|
|
6
|
-
export {
|
|
8
|
+
export type { ParseFailure, ParseResult, ParseSuccess } from "./parseAiJson";
|
|
9
|
+
export { normalizeLlmJsonTextForStructuredOutput, parseAiJson } from "./parseAiJson";
|
|
10
|
+
export { CONTENT_SUMMARY_PROMPT, DEFAULT_GPT_MEMORY, JSON_VALUE_SYSTEM_PROMPT, REMIX_PROMPT, TITLE_GENERATION_PROMPT, TRANSLATION_PROMPT, } from "./prompts";
|
|
7
11
|
export type { CreateVertexProviderOptions, ListEnabledVertexModelsOptions, TerrenoVertexProvider, VerifyVertexModelsOptions, VertexLanguageModelProvider, VertexModelAvailability, } from "./vertex";
|
|
8
12
|
export { assertVertexModelsEnabled, createVertexProvider, DEFAULT_VERTEX_LOCATION, isVertexModelAllowed, listEnabledVertexModels, normalizeVertexModelId, verifyVertexModelsEnabled, } from "./vertex";
|
|
9
13
|
export type { WebSearchProvider, WebSearchResult } from "./webSearchTool";
|
package/dist/service/index.js
CHANGED
|
@@ -1,6 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.verifyVertexModelsEnabled = exports.normalizeVertexModelId = exports.listEnabledVertexModels = exports.isVertexModelAllowed = exports.DEFAULT_VERTEX_LOCATION = exports.createVertexProvider = exports.assertVertexModelsEnabled = exports.TRANSLATION_PROMPT = exports.TITLE_GENERATION_PROMPT = exports.REMIX_PROMPT = exports.DEFAULT_GPT_MEMORY = exports.CONTENT_SUMMARY_PROMPT = exports.MCPService = exports.normalizeGeminiModelId = exports.listGeminiApiModels = exports.GEMINI_API_BASE_URL = exports.FileStorageService = exports.TemperaturePresets = exports.AIService = void 0;
|
|
3
|
+
exports.verifyVertexModelsEnabled = exports.normalizeVertexModelId = exports.listEnabledVertexModels = exports.isVertexModelAllowed = exports.DEFAULT_VERTEX_LOCATION = exports.createVertexProvider = exports.assertVertexModelsEnabled = exports.TRANSLATION_PROMPT = exports.TITLE_GENERATION_PROMPT = exports.REMIX_PROMPT = exports.JSON_VALUE_SYSTEM_PROMPT = exports.DEFAULT_GPT_MEMORY = exports.CONTENT_SUMMARY_PROMPT = exports.parseAiJson = exports.normalizeLlmJsonTextForStructuredOutput = exports.MCPService = exports.normalizeGeminiModelId = exports.listGeminiApiModels = exports.GEMINI_API_BASE_URL = exports.FileStorageService = exports.TemperaturePresets = exports.AIService = exports.Output = exports.jsonSchema = void 0;
|
|
4
|
+
var ai_1 = require("ai");
|
|
5
|
+
Object.defineProperty(exports, "jsonSchema", { enumerable: true, get: function () { return ai_1.jsonSchema; } });
|
|
6
|
+
Object.defineProperty(exports, "Output", { enumerable: true, get: function () { return ai_1.Output; } });
|
|
4
7
|
var aiService_1 = require("./aiService");
|
|
5
8
|
Object.defineProperty(exports, "AIService", { enumerable: true, get: function () { return aiService_1.AIService; } });
|
|
6
9
|
Object.defineProperty(exports, "TemperaturePresets", { enumerable: true, get: function () { return aiService_1.TemperaturePresets; } });
|
|
@@ -12,9 +15,13 @@ Object.defineProperty(exports, "listGeminiApiModels", { enumerable: true, get: f
|
|
|
12
15
|
Object.defineProperty(exports, "normalizeGeminiModelId", { enumerable: true, get: function () { return gemini_1.normalizeGeminiModelId; } });
|
|
13
16
|
var mcpService_1 = require("./mcpService");
|
|
14
17
|
Object.defineProperty(exports, "MCPService", { enumerable: true, get: function () { return mcpService_1.MCPService; } });
|
|
18
|
+
var parseAiJson_1 = require("./parseAiJson");
|
|
19
|
+
Object.defineProperty(exports, "normalizeLlmJsonTextForStructuredOutput", { enumerable: true, get: function () { return parseAiJson_1.normalizeLlmJsonTextForStructuredOutput; } });
|
|
20
|
+
Object.defineProperty(exports, "parseAiJson", { enumerable: true, get: function () { return parseAiJson_1.parseAiJson; } });
|
|
15
21
|
var prompts_1 = require("./prompts");
|
|
16
22
|
Object.defineProperty(exports, "CONTENT_SUMMARY_PROMPT", { enumerable: true, get: function () { return prompts_1.CONTENT_SUMMARY_PROMPT; } });
|
|
17
23
|
Object.defineProperty(exports, "DEFAULT_GPT_MEMORY", { enumerable: true, get: function () { return prompts_1.DEFAULT_GPT_MEMORY; } });
|
|
24
|
+
Object.defineProperty(exports, "JSON_VALUE_SYSTEM_PROMPT", { enumerable: true, get: function () { return prompts_1.JSON_VALUE_SYSTEM_PROMPT; } });
|
|
18
25
|
Object.defineProperty(exports, "REMIX_PROMPT", { enumerable: true, get: function () { return prompts_1.REMIX_PROMPT; } });
|
|
19
26
|
Object.defineProperty(exports, "TITLE_GENERATION_PROMPT", { enumerable: true, get: function () { return prompts_1.TITLE_GENERATION_PROMPT; } });
|
|
20
27
|
Object.defineProperty(exports, "TRANSLATION_PROMPT", { enumerable: true, get: function () { return prompts_1.TRANSLATION_PROMPT; } });
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Bulletproof-ish extraction of JSON from LLM output.
|
|
3
|
+
*
|
|
4
|
+
* Handles common "return only JSON" violations:
|
|
5
|
+
* - markdown code fences (full ```json … ``` wrappers or partial ``` lines)
|
|
6
|
+
* - preamble / trailing prose around a JSON value
|
|
7
|
+
* - JSON buried mid-string (first balanced `{`/`[` … `}`/`]` slice)
|
|
8
|
+
* - trailing commas before `}` or `]`
|
|
9
|
+
* - smart quotes outside string literals (conservative repair)
|
|
10
|
+
*
|
|
11
|
+
* Strategy: try the cheapest parse first, escalate only when it fails.
|
|
12
|
+
*/
|
|
13
|
+
export interface ParseSuccess<T> {
|
|
14
|
+
data: T;
|
|
15
|
+
repaired: boolean;
|
|
16
|
+
success: true;
|
|
17
|
+
}
|
|
18
|
+
export interface ParseFailure {
|
|
19
|
+
error: string;
|
|
20
|
+
raw: string;
|
|
21
|
+
success: false;
|
|
22
|
+
}
|
|
23
|
+
export type ParseResult<T> = ParseFailure | ParseSuccess<T>;
|
|
24
|
+
/**
|
|
25
|
+
* Extract and parse JSON from arbitrary LLM output.
|
|
26
|
+
*/
|
|
27
|
+
export declare const parseAiJson: <T = unknown>(input: string) => ParseResult<T>;
|
|
28
|
+
/**
|
|
29
|
+
* Normalizes raw LLM text into a single JSON text payload for Vercel `Output.*` parsers.
|
|
30
|
+
* On success returns `JSON.stringify` of the parsed value; on failure returns `cleaned`
|
|
31
|
+
* (fence-stripped) text so the SDK can still attempt its own error path.
|
|
32
|
+
*/
|
|
33
|
+
export declare const normalizeLlmJsonTextForStructuredOutput: (raw: string) => string;
|