@llumiverse/core 0.22.0 → 0.23.0-dev-20251118
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/README.md +1 -1
- package/lib/cjs/CompletionStream.js +89 -20
- package/lib/cjs/CompletionStream.js.map +1 -1
- package/lib/cjs/Driver.js +23 -5
- package/lib/cjs/Driver.js.map +1 -1
- package/lib/cjs/async.js.map +1 -1
- package/lib/cjs/json.js +3 -174
- package/lib/cjs/json.js.map +1 -1
- package/lib/cjs/stream.js +16 -10
- package/lib/cjs/stream.js.map +1 -1
- package/lib/cjs/validation.js +31 -7
- package/lib/cjs/validation.js.map +1 -1
- package/lib/esm/CompletionStream.js +89 -20
- package/lib/esm/CompletionStream.js.map +1 -1
- package/lib/esm/Driver.js +23 -5
- package/lib/esm/Driver.js.map +1 -1
- package/lib/esm/async.js.map +1 -1
- package/lib/esm/json.js +3 -172
- package/lib/esm/json.js.map +1 -1
- package/lib/esm/stream.js +16 -10
- package/lib/esm/stream.js.map +1 -1
- package/lib/esm/validation.js +31 -7
- package/lib/esm/validation.js.map +1 -1
- package/lib/tsconfig.tsbuildinfo +1 -0
- package/lib/types/CompletionStream.d.ts +2 -2
- package/lib/types/CompletionStream.d.ts.map +1 -1
- package/lib/types/Driver.d.ts +3 -3
- package/lib/types/Driver.d.ts.map +1 -1
- package/lib/types/async.d.ts +2 -2
- package/lib/types/async.d.ts.map +1 -1
- package/lib/types/json.d.ts +0 -13
- package/lib/types/json.d.ts.map +1 -1
- package/lib/types/stream.d.ts.map +1 -1
- package/lib/types/validation.d.ts +2 -2
- package/lib/types/validation.d.ts.map +1 -1
- package/package.json +87 -86
- package/src/CompletionStream.ts +88 -21
- package/src/Driver.ts +29 -13
- package/src/async.ts +4 -4
- package/src/json.ts +3 -168
- package/src/stream.ts +19 -11
- package/src/validation.ts +33 -10
|
@@ -2,33 +2,30 @@ export class DefaultCompletionStream {
|
|
|
2
2
|
driver;
|
|
3
3
|
prompt;
|
|
4
4
|
options;
|
|
5
|
-
chunks;
|
|
5
|
+
chunks; // Counter for number of chunks instead of storing strings
|
|
6
6
|
completion;
|
|
7
7
|
constructor(driver, prompt, options) {
|
|
8
8
|
this.driver = driver;
|
|
9
9
|
this.prompt = prompt;
|
|
10
10
|
this.options = options;
|
|
11
|
-
this.chunks =
|
|
11
|
+
this.chunks = 0;
|
|
12
12
|
}
|
|
13
13
|
async *[Symbol.asyncIterator]() {
|
|
14
14
|
// reset state
|
|
15
15
|
this.completion = undefined;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}
|
|
19
|
-
const chunks = this.chunks;
|
|
16
|
+
this.chunks = 0;
|
|
17
|
+
const accumulatedResults = []; // Accumulate CompletionResult[] from chunks
|
|
20
18
|
this.driver.logger.debug(`[${this.driver.provider}] Streaming Execution of ${this.options.model} with prompt`);
|
|
21
19
|
const start = Date.now();
|
|
22
|
-
let stream;
|
|
23
20
|
let finish_reason = undefined;
|
|
24
21
|
let promptTokens = 0;
|
|
25
22
|
let resultTokens = undefined;
|
|
26
23
|
try {
|
|
27
|
-
stream = await this.driver.requestTextCompletionStream(this.prompt, this.options);
|
|
24
|
+
const stream = await this.driver.requestTextCompletionStream(this.prompt, this.options);
|
|
28
25
|
for await (const chunk of stream) {
|
|
29
26
|
if (chunk) {
|
|
30
27
|
if (typeof chunk === 'string') {
|
|
31
|
-
chunks
|
|
28
|
+
this.chunks++;
|
|
32
29
|
yield chunk;
|
|
33
30
|
}
|
|
34
31
|
else {
|
|
@@ -42,9 +39,66 @@ export class DefaultCompletionStream {
|
|
|
42
39
|
promptTokens = Math.max(promptTokens, chunk.token_usage.prompt ?? 0);
|
|
43
40
|
resultTokens = Math.max(resultTokens ?? 0, chunk.token_usage.result ?? 0);
|
|
44
41
|
}
|
|
45
|
-
if (chunk.result) {
|
|
46
|
-
|
|
47
|
-
|
|
42
|
+
if (Array.isArray(chunk.result) && chunk.result.length > 0) {
|
|
43
|
+
// Process each result in the chunk, combining consecutive text/JSON
|
|
44
|
+
for (const result of chunk.result) {
|
|
45
|
+
// Check if we can combine with the last accumulated result
|
|
46
|
+
const lastResult = accumulatedResults[accumulatedResults.length - 1];
|
|
47
|
+
if (lastResult &&
|
|
48
|
+
((lastResult.type === 'text' && result.type === 'text') ||
|
|
49
|
+
(lastResult.type === 'json' && result.type === 'json'))) {
|
|
50
|
+
// Combine consecutive text or JSON results
|
|
51
|
+
if (result.type === 'text') {
|
|
52
|
+
lastResult.value += result.value;
|
|
53
|
+
}
|
|
54
|
+
else if (result.type === 'json') {
|
|
55
|
+
// For JSON, combine the parsed objects directly
|
|
56
|
+
try {
|
|
57
|
+
const lastParsed = lastResult.value;
|
|
58
|
+
const currentParsed = result.value;
|
|
59
|
+
if (lastParsed !== null && typeof lastParsed === 'object' &&
|
|
60
|
+
currentParsed !== null && typeof currentParsed === 'object') {
|
|
61
|
+
const combined = { ...lastParsed, ...currentParsed };
|
|
62
|
+
lastResult.value = combined;
|
|
63
|
+
}
|
|
64
|
+
else {
|
|
65
|
+
// If not objects, convert to string and concatenate
|
|
66
|
+
const lastStr = typeof lastParsed === 'string' ? lastParsed : JSON.stringify(lastParsed);
|
|
67
|
+
const currentStr = typeof currentParsed === 'string' ? currentParsed : JSON.stringify(currentParsed);
|
|
68
|
+
lastResult.value = lastStr + currentStr;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
// If anything fails, just concatenate string representations
|
|
73
|
+
lastResult.value = String(lastResult.value) + String(result.value);
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
else {
|
|
78
|
+
// Add as new result
|
|
79
|
+
accumulatedResults.push(result);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
// Convert CompletionResult[] to string for streaming
|
|
83
|
+
// Only yield if we have results to show
|
|
84
|
+
const resultText = chunk.result.map(r => {
|
|
85
|
+
switch (r.type) {
|
|
86
|
+
case 'text':
|
|
87
|
+
return r.value;
|
|
88
|
+
case 'json':
|
|
89
|
+
return JSON.stringify(r.value);
|
|
90
|
+
case 'image':
|
|
91
|
+
// Show truncated image placeholder for streaming
|
|
92
|
+
const truncatedValue = typeof r.value === 'string' ? r.value.slice(0, 10) : String(r.value).slice(0, 10);
|
|
93
|
+
return `\n[Image: ${truncatedValue}...]\n`;
|
|
94
|
+
default:
|
|
95
|
+
return String(r.value || '');
|
|
96
|
+
}
|
|
97
|
+
}).join('');
|
|
98
|
+
if (resultText) {
|
|
99
|
+
this.chunks++;
|
|
100
|
+
yield resultText;
|
|
101
|
+
}
|
|
48
102
|
}
|
|
49
103
|
}
|
|
50
104
|
}
|
|
@@ -54,21 +108,22 @@ export class DefaultCompletionStream {
|
|
|
54
108
|
error.prompt = this.prompt;
|
|
55
109
|
throw error;
|
|
56
110
|
}
|
|
57
|
-
const content = chunks.join('');
|
|
58
111
|
// Return undefined for the ExecutionTokenUsage object if there is nothing to fill it with.
|
|
59
|
-
// Allows for checking for
|
|
60
|
-
|
|
112
|
+
// Allows for checking for truthy-ness on token_usage, rather than it's internals. For testing and downstream usage.
|
|
113
|
+
const tokens = resultTokens ?
|
|
61
114
|
{ prompt: promptTokens, result: resultTokens, total: resultTokens + promptTokens, } : undefined;
|
|
62
115
|
this.completion = {
|
|
63
|
-
result:
|
|
116
|
+
result: accumulatedResults, // Return the accumulated CompletionResult[] instead of text
|
|
64
117
|
prompt: this.prompt,
|
|
65
118
|
execution_time: Date.now() - start,
|
|
66
119
|
token_usage: tokens,
|
|
67
120
|
finish_reason: finish_reason,
|
|
68
|
-
chunks: chunks
|
|
121
|
+
chunks: this.chunks,
|
|
69
122
|
};
|
|
70
123
|
try {
|
|
71
|
-
|
|
124
|
+
if (this.completion) {
|
|
125
|
+
this.driver.validateResult(this.completion, this.options);
|
|
126
|
+
}
|
|
72
127
|
}
|
|
73
128
|
catch (error) {
|
|
74
129
|
error.prompt = this.prompt;
|
|
@@ -92,9 +147,23 @@ export class FallbackCompletionStream {
|
|
|
92
147
|
this.driver.logger.debug(`[${this.driver.provider}] Streaming is not supported, falling back to blocking execution`);
|
|
93
148
|
try {
|
|
94
149
|
const completion = await this.driver._execute(this.prompt, this.options);
|
|
95
|
-
|
|
150
|
+
// For fallback streaming, yield the text content but keep the original completion
|
|
151
|
+
const content = completion.result.map(r => {
|
|
152
|
+
switch (r.type) {
|
|
153
|
+
case 'text':
|
|
154
|
+
return r.value;
|
|
155
|
+
case 'json':
|
|
156
|
+
return JSON.stringify(r.value);
|
|
157
|
+
case 'image':
|
|
158
|
+
// Show truncated image placeholder for streaming
|
|
159
|
+
const truncatedValue = typeof r.value === 'string' ? r.value.slice(0, 10) : String(r.value).slice(0, 10);
|
|
160
|
+
return `[Image: ${truncatedValue}...]`;
|
|
161
|
+
default:
|
|
162
|
+
return String(r.value || '');
|
|
163
|
+
}
|
|
164
|
+
}).join('');
|
|
96
165
|
yield content;
|
|
97
|
-
this.completion = completion;
|
|
166
|
+
this.completion = completion; // Return the original completion with untouched CompletionResult[]
|
|
98
167
|
}
|
|
99
168
|
catch (error) {
|
|
100
169
|
error.prompt = this.prompt;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CompletionStream.js","sourceRoot":"","sources":["../../src/CompletionStream.ts"],"names":[],"mappings":"AAGA,MAAM,OAAO,uBAAuB;IAKb;IACR;IACA;IALX,MAAM,
|
|
1
|
+
{"version":3,"file":"CompletionStream.js","sourceRoot":"","sources":["../../src/CompletionStream.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/Driver.js
CHANGED
|
@@ -7,11 +7,28 @@ import { DefaultCompletionStream, FallbackCompletionStream } from "./CompletionS
|
|
|
7
7
|
import { formatTextPrompt } from "./formatters/index.js";
|
|
8
8
|
import { Modalities } from "@llumiverse/common";
|
|
9
9
|
import { validateResult } from "./validation.js";
|
|
10
|
+
// Helper to create logger methods that support both message-only and object-first signatures
|
|
11
|
+
function createConsoleLoggerMethod(consoleMethod) {
|
|
12
|
+
return ((objOrMsg, msgOrNever, ...args) => {
|
|
13
|
+
if (typeof objOrMsg === 'string') {
|
|
14
|
+
// Message-only: logger.info("message", ...args)
|
|
15
|
+
consoleMethod(objOrMsg, msgOrNever, ...args);
|
|
16
|
+
}
|
|
17
|
+
else if (msgOrNever !== undefined) {
|
|
18
|
+
// Object-first: logger.info({ obj }, "message", ...args)
|
|
19
|
+
consoleMethod(msgOrNever, objOrMsg, ...args);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
// Object-only: logger.info({ obj })
|
|
23
|
+
consoleMethod(objOrMsg, ...args);
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
}
|
|
10
27
|
const ConsoleLogger = {
|
|
11
|
-
debug: console.debug,
|
|
12
|
-
info: console.info,
|
|
13
|
-
warn: console.warn,
|
|
14
|
-
error: console.error,
|
|
28
|
+
debug: createConsoleLoggerMethod(console.debug.bind(console)),
|
|
29
|
+
info: createConsoleLoggerMethod(console.info.bind(console)),
|
|
30
|
+
warn: createConsoleLoggerMethod(console.warn.bind(console)),
|
|
31
|
+
error: createConsoleLoggerMethod(console.error.bind(console)),
|
|
15
32
|
};
|
|
16
33
|
const noop = () => void 0;
|
|
17
34
|
const NoopLogger = {
|
|
@@ -63,7 +80,8 @@ export class AbstractDriver {
|
|
|
63
80
|
result.result = validateResult(result.result, options.result_schema);
|
|
64
81
|
}
|
|
65
82
|
catch (error) {
|
|
66
|
-
|
|
83
|
+
const errorMessage = `[${this.provider}] [${options.model}] ${error.code ? '[' + error.code + '] ' : ''}Result validation error: ${error.message}`;
|
|
84
|
+
this.logger.error({ err: error, data: result.result }, errorMessage);
|
|
67
85
|
result.error = {
|
|
68
86
|
code: error.code || error.name,
|
|
69
87
|
message: error.message,
|
package/lib/esm/Driver.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Driver.js","sourceRoot":"","sources":["../../src/Driver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,
|
|
1
|
+
{"version":3,"file":"Driver.js","sourceRoot":"","sources":["../../src/Driver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,uBAAuB,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAYH,UAAU,EAOb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,6FAA6F;AAC7F,SAAS,yBAAyB,CAAC,aAA2C;IAC1E,OAAO,CAAC,CAAC,QAAa,EAAE,UAAgB,EAAE,GAAG,IAAmC,EAAE,EAAE;QAChF,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC/B,gDAAgD;YAChD,aAAa,CAAC,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,CAAC;QACjD,CAAC;aAAM,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAClC,yDAAyD;YACzD,aAAa,CAAC,UAAU,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;QACjD,CAAC;aAAM,CAAC;YACJ,oCAAoC;YACpC,aAAa,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;QACrC,CAAC;IACL,CAAC,CAAmB,CAAC;AACzB,CAAC;AAED,MAAM,aAAa,GAAW;IAC1B,KAAK,EAAE,yBAAyB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7D,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,IAAI,EAAE,yBAAyB,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3D,KAAK,EAAE,yBAAyB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;CAChE,CAAA;AAED,MAAM,IAAI,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;AAC1B,MAAM,UAAU,GAAW;IACvB,KAAK,EAAE,IAAuB;IAC9B,IAAI,EAAE,IAAsB;IAC5B,IAAI,EAAE,IAAsB;IAC5B,KAAK,EAAE,IAAuB;CACjC,CAAA;AAED,MAAM,UAAU,YAAY,CAAC,MAAsC;IAC/D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,OAAO,aAAa,CAAC;IACzB,CAAC;SAAM,IAAI,MAAM,EAAE,CAAC;QAChB,OAAO,MAAM,CAAC;IAClB,CAAC;SAAM,CAAC;QACJ,OAAO,UAAU,CAAC;IACtB,CAAC;AACL,CAAC;AAwCD;;GAEG;AACH,MAAM,OAAgB,cAAc;IAChC,OAAO,CAAW;IAClB,MAAM,CAAS;IAIf,YAAY,IAAc;QACtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,OAA8B;QACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,aAAa,EAAE,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAA;QACjH,OAAO,IAAI,CAAC,SAAS,CAAC;YAClB,MAAM;YACN,UAAU,EAAE,OAAO,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC;SAC/G,CAAC,CAAC;IACP,CAAC;IAED,aAAa,CAAC,QAAoB,EAAE,QAAyB;QACzD,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED,cAAc,CAAC,MAAc;QACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED,cAAc,CAAC,MAAc;QACzB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC/C,CAAC;IAED,cAAc,CAAC,MAAkB,EAAE,OAAyB;QACxD,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC7D,IAAI,CAAC;gBACD,MAAM,CAAC,MAAM,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;YACzE,CAAC;YAAC,OAAO,KAAU,EAAE,CAAC;gBAClB,MAAM,YAAY,GAAG,IAAI,IAAI,CAAC,QAAQ,MAAM,OAAO,CAAC,KAAK,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC;gBACnJ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,YAAY,CAAC,CAAC;gBACrE,MAAM,CAAC,KAAK,GAAG;oBACX,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI;oBAC9B,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,IAAI,EAAE,MAAM,CAAC,MAAM;iBACtB,CAAA;YACL,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,QAAyB,EAAE,OAAyB;QAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,KAAU,EAAE,EAAE;YACtD,KAAa,CAAC,MAAM,GAAG,MAAM,CAAC;YAC/B,MAAM,KAAK,CAAC;QAChB,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,MAAe,EAAE,OAAyB;QACrD,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,IAAI,IAAI,CAAC,QAAQ,yBAAyB,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;QAC/D,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YACzB,IAAI,MAAM,CAAC;YAEX,QAAQ,OAAO,CAAC,eAAe,EAAE,CAAC;gBAC9B,KAAK,UAAU,CAAC,IAAI;oBAChB,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;oBAC3D,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;oBACrC,MAAM;gBACV,KAAK,UAAU,CAAC,KAAK;oBACjB,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;oBAC5D,MAAM;gBACV;oBACI,MAAM,IAAI,KAAK,CAAC,yBAAyB,OAAO,CAAC,iBAAiB,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;YAC1G,CAAC;YAED,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;YAC1C,OAAO,EAAE,GAAG,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;QACjD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACZ,KAAa,CAAC,MAAM,GAAG,MAAM,CAAC;YAC/B,MAAM,KAAK,CAAC;QAChB,CAAC;IACL,CAAC;IAED,wEAAwE;IACxE,KAAK,CAAC,MAAM,CAAC,QAAyB,EAAE,OAAyB;QAC7D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAChD,IAAI,OAAO,CAAC,eAAe,KAAK,UAAU,CAAC,IAAI,IAAI,SAAS,EAAE,CAAC;YAC3D,OAAO,IAAI,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC9D,CAAC;aAAM,CAAC;YACJ,OAAO,IAAI,wBAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QAC/D,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,YAAY,CAAC,QAAyB,EAAE,IAAmB;QACvE,OAAO,gBAAgB,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAY,CAAC;IACrE,CAAC;IAEM,KAAK,CAAC,YAAY,CAAC,QAAyB,EAAE,IAAmB;QACpE,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAC/G,CAAC;IAED;;;;;;;;OAQG;IACO,SAAS,CAAC,QAA0B;QAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;IAMD,KAAK,CAAC,sBAAsB,CAAC,OAAgB,EAAE,QAA0B;QACrE,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACrD,gFAAgF;IACpF,CAAC;CAWJ"}
|
package/lib/esm/async.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"async.js","sourceRoot":"","sources":["../../src/async.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,QAAQ,CAAO,aAA+B,EAAE,QAAwC;IAC3G,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,KAAK,EAAE,MAAM,GAAG,IAAI,aAAa;QACjC,MAAM,QAAQ,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAI,KAAQ;IACxC,OAAO;QACH,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;YACzB,MAAM,KAAK,CAAA;QACf,CAAC;KACJ,CAAA;AACL,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,MAAuC,EAAE,
|
|
1
|
+
{"version":3,"file":"async.js","sourceRoot":"","sources":["../../src/async.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/json.js
CHANGED
|
@@ -1,181 +1,12 @@
|
|
|
1
|
+
import { jsonrepair } from 'jsonrepair';
|
|
1
2
|
function extractJsonFromText(text) {
|
|
2
3
|
const start = text.indexOf("{");
|
|
3
4
|
const end = text.lastIndexOf("}");
|
|
4
|
-
|
|
5
|
-
return text.replace(/\\n/g, "");
|
|
5
|
+
return text.substring(start, end + 1);
|
|
6
6
|
}
|
|
7
7
|
export function extractAndParseJSON(text) {
|
|
8
8
|
return parseJSON(extractJsonFromText(text));
|
|
9
9
|
}
|
|
10
|
-
const RX_DQUOTE = /^"([^"\\]|\\.)*"/us;
|
|
11
|
-
const RX_SQUOTE = /^'([^'\\]|\\.)*'/us;
|
|
12
|
-
const RX_NUMBER = /^-?\d+(\.\d+)?/;
|
|
13
|
-
const RX_BOOLEAN = /^true|false/;
|
|
14
|
-
const RX_NULL = /^null/;
|
|
15
|
-
const RX_KEY = /^[$_a-zA-Z][$_a-zA-Z0-9]*/;
|
|
16
|
-
const RX_PUNCTUATION = /^\s*([\[\]{}:,])\s*/;
|
|
17
|
-
function fixText(value) {
|
|
18
|
-
return value.replaceAll('\n', '\\n').replaceAll('\r', '\\r');
|
|
19
|
-
}
|
|
20
|
-
function decodeSingleQuotedString(value) {
|
|
21
|
-
return JSON.parse('"' + value.slice(1, -1).replaceAll(/(?<!\\)"/g, '\\"') + '"');
|
|
22
|
-
}
|
|
23
|
-
export class JsonParser {
|
|
24
|
-
text;
|
|
25
|
-
pos = 0;
|
|
26
|
-
constructor(text) {
|
|
27
|
-
this.text = text;
|
|
28
|
-
}
|
|
29
|
-
skip(n) {
|
|
30
|
-
this.text = this.text.substring(n);
|
|
31
|
-
this.pos += n;
|
|
32
|
-
}
|
|
33
|
-
tryReadPunctuation() {
|
|
34
|
-
const m = RX_PUNCTUATION.exec(this.text);
|
|
35
|
-
if (m) {
|
|
36
|
-
this.skip(m[0].length);
|
|
37
|
-
return m[1];
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
readKey() {
|
|
41
|
-
const first = this.text.charCodeAt(0);
|
|
42
|
-
if (first === 34) { // "
|
|
43
|
-
const m = RX_DQUOTE.exec(this.text);
|
|
44
|
-
if (m) {
|
|
45
|
-
this.skip(m[0].length);
|
|
46
|
-
return JSON.parse(m[0]);
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
else if (first === 39) { // '
|
|
50
|
-
const m = RX_SQUOTE.exec(this.text);
|
|
51
|
-
if (m) {
|
|
52
|
-
this.skip(m[0].length);
|
|
53
|
-
return decodeSingleQuotedString(m[0]);
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
else {
|
|
57
|
-
const m = RX_KEY.exec(this.text);
|
|
58
|
-
if (m) {
|
|
59
|
-
this.skip(m[0].length);
|
|
60
|
-
return m[0];
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
|
|
64
|
-
}
|
|
65
|
-
readScalar() {
|
|
66
|
-
const first = this.text.charCodeAt(0);
|
|
67
|
-
if (first === 34) { // "
|
|
68
|
-
const m = RX_DQUOTE.exec(this.text);
|
|
69
|
-
if (m) {
|
|
70
|
-
this.skip(m[0].length);
|
|
71
|
-
return JSON.parse(fixText(m[0]));
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
else if (first === 39) { // '
|
|
75
|
-
const m = RX_SQUOTE.exec(this.text);
|
|
76
|
-
if (m) {
|
|
77
|
-
this.skip(m[0].length);
|
|
78
|
-
return decodeSingleQuotedString(fixText(m[0]));
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
else {
|
|
82
|
-
let m = RX_NUMBER.exec(this.text);
|
|
83
|
-
if (m) {
|
|
84
|
-
this.skip(m[0].length);
|
|
85
|
-
return parseFloat(m[0]);
|
|
86
|
-
}
|
|
87
|
-
m = RX_BOOLEAN.exec(this.text);
|
|
88
|
-
if (m) {
|
|
89
|
-
this.skip(m[0].length);
|
|
90
|
-
return m[0] === 'true';
|
|
91
|
-
}
|
|
92
|
-
m = RX_NULL.exec(this.text);
|
|
93
|
-
if (m) {
|
|
94
|
-
this.skip(m[0].length);
|
|
95
|
-
return null;
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
|
|
99
|
-
}
|
|
100
|
-
readObject() {
|
|
101
|
-
let key;
|
|
102
|
-
const obj = {};
|
|
103
|
-
while (true) {
|
|
104
|
-
if (!key) { // read key
|
|
105
|
-
const p = this.tryReadPunctuation();
|
|
106
|
-
if (p === '}') {
|
|
107
|
-
return obj;
|
|
108
|
-
}
|
|
109
|
-
else if (p === ',') {
|
|
110
|
-
continue;
|
|
111
|
-
}
|
|
112
|
-
else if (p) {
|
|
113
|
-
throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
|
|
114
|
-
}
|
|
115
|
-
key = this.readKey();
|
|
116
|
-
if (!key) {
|
|
117
|
-
throw new Error('Expected a key at position ' + this.pos + ' but found ' + this.text);
|
|
118
|
-
}
|
|
119
|
-
if (this.tryReadPunctuation() !== ':') {
|
|
120
|
-
throw new Error('Expected a colon at position ' + this.pos + ' but found ' + this.text);
|
|
121
|
-
}
|
|
122
|
-
;
|
|
123
|
-
}
|
|
124
|
-
else { // read value
|
|
125
|
-
const value = this.readValue();
|
|
126
|
-
if (value === undefined) {
|
|
127
|
-
throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
|
|
128
|
-
}
|
|
129
|
-
obj[key] = value;
|
|
130
|
-
key = undefined;
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
readArray() {
|
|
135
|
-
const ar = [];
|
|
136
|
-
while (true) {
|
|
137
|
-
const p = this.tryReadPunctuation();
|
|
138
|
-
if (p === ',') {
|
|
139
|
-
continue;
|
|
140
|
-
}
|
|
141
|
-
else if (p === ']') {
|
|
142
|
-
return ar;
|
|
143
|
-
}
|
|
144
|
-
else if (p === '[') {
|
|
145
|
-
ar.push(this.readArray());
|
|
146
|
-
}
|
|
147
|
-
else if (p === '{') {
|
|
148
|
-
ar.push(this.readObject());
|
|
149
|
-
}
|
|
150
|
-
else if (!p) {
|
|
151
|
-
ar.push(this.readScalar());
|
|
152
|
-
}
|
|
153
|
-
else {
|
|
154
|
-
throw new Error('Expected a value at position ' + this.pos + ' but found ' + this.text);
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
}
|
|
158
|
-
readValue() {
|
|
159
|
-
const p = this.tryReadPunctuation();
|
|
160
|
-
if (p === '{') {
|
|
161
|
-
return this.readObject();
|
|
162
|
-
}
|
|
163
|
-
else if (p === '[') {
|
|
164
|
-
return this.readArray();
|
|
165
|
-
}
|
|
166
|
-
else if (!p) {
|
|
167
|
-
return this.readScalar();
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
static parse(text) {
|
|
171
|
-
const parser = new JsonParser(text);
|
|
172
|
-
const r = parser.readValue();
|
|
173
|
-
if (r === undefined) {
|
|
174
|
-
throw new Error('Not a valid JSON');
|
|
175
|
-
}
|
|
176
|
-
return r;
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
10
|
export function parseJSON(text) {
|
|
180
11
|
text = text.trim();
|
|
181
12
|
try {
|
|
@@ -184,7 +15,7 @@ export function parseJSON(text) {
|
|
|
184
15
|
catch (err) {
|
|
185
16
|
// use a relaxed parser
|
|
186
17
|
try {
|
|
187
|
-
return
|
|
18
|
+
return JSON.parse(jsonrepair(text));
|
|
188
19
|
}
|
|
189
20
|
catch (err2) { // throw the original error
|
|
190
21
|
throw err;
|
package/lib/esm/json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/json.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/json.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,SAAS,mBAAmB,CAAC,IAAY;IACrC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;IAClC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC5C,OAAO,SAAS,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAY;IAClC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IACnB,IAAI,CAAC;QACD,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAChB,uBAAuB;QACvB,IAAI,CAAC;YACD,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,CAAC;QAAC,OAAO,IAAS,EAAE,CAAC,CAAC,2BAA2B;YAC7C,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;AACL,CAAC"}
|
package/lib/esm/stream.js
CHANGED
|
@@ -1,19 +1,25 @@
|
|
|
1
1
|
export async function readStreamAsBase64(stream) {
|
|
2
|
-
|
|
2
|
+
const uint8Array = await readStreamAsUint8Array(stream);
|
|
3
|
+
return Buffer.from(uint8Array).toString('base64');
|
|
3
4
|
}
|
|
4
5
|
export async function readStreamAsString(stream) {
|
|
5
|
-
|
|
6
|
+
const uint8Array = await readStreamAsUint8Array(stream);
|
|
7
|
+
return Buffer.from(uint8Array).toString();
|
|
6
8
|
}
|
|
7
9
|
export async function readStreamAsUint8Array(stream) {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
return new Uint8Array(buffer.buffer, buffer.byteOffset, buffer.byteLength);
|
|
11
|
-
}
|
|
12
|
-
async function _readStreamAsBuffer(stream) {
|
|
13
|
-
const out = [];
|
|
10
|
+
const chunks = [];
|
|
11
|
+
let totalLength = 0;
|
|
14
12
|
for await (const chunk of stream) {
|
|
15
|
-
|
|
13
|
+
const uint8Chunk = chunk instanceof Uint8Array ? chunk : new Uint8Array(chunk);
|
|
14
|
+
chunks.push(uint8Chunk);
|
|
15
|
+
totalLength += uint8Chunk.length;
|
|
16
|
+
}
|
|
17
|
+
const combined = new Uint8Array(totalLength);
|
|
18
|
+
let offset = 0;
|
|
19
|
+
for (const chunk of chunks) {
|
|
20
|
+
combined.set(chunk, offset);
|
|
21
|
+
offset += chunk.length;
|
|
16
22
|
}
|
|
17
|
-
return
|
|
23
|
+
return combined;
|
|
18
24
|
}
|
|
19
25
|
//# sourceMappingURL=stream.js.map
|
package/lib/esm/stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAAsB;IAC3D,
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../src/stream.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAAsB;IAC3D,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAAC,MAAM,CAAC,CAAC;IACxD,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAAsB;IAC3D,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAAC,MAAM,CAAC,CAAC;IACxD,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC9C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,MAAsB;IAC/D,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,IAAI,WAAW,GAAG,CAAC,CAAC;IAEpB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC/B,MAAM,UAAU,GAAG,KAAK,YAAY,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC;QAC/E,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACxB,WAAW,IAAI,UAAU,CAAC,MAAM,CAAC;IACrC,CAAC;IAED,MAAM,QAAQ,GAAG,IAAI,UAAU,CAAC,WAAW,CAAC,CAAC;IAC7C,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACzB,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,OAAO,QAAQ,CAAC;AACpB,CAAC"}
|
package/lib/esm/validation.js
CHANGED
|
@@ -20,18 +20,42 @@ export class ValidationError extends Error {
|
|
|
20
20
|
this.name = 'ValidationError';
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
|
+
function parseCompletionAsJson(data) {
|
|
24
|
+
let lastError;
|
|
25
|
+
for (const part of data) {
|
|
26
|
+
if (part.type === "text") {
|
|
27
|
+
const text = part.value.trim();
|
|
28
|
+
try {
|
|
29
|
+
return extractAndParseJSON(text);
|
|
30
|
+
}
|
|
31
|
+
catch (error) {
|
|
32
|
+
lastError = new ValidationError("json_error", error.message);
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
if (!lastError) {
|
|
37
|
+
lastError = new ValidationError("json_error", "No JSON compatible response found in completion result");
|
|
38
|
+
}
|
|
39
|
+
throw lastError;
|
|
40
|
+
}
|
|
23
41
|
export function validateResult(data, schema) {
|
|
24
42
|
let json;
|
|
25
|
-
if (
|
|
26
|
-
|
|
27
|
-
|
|
43
|
+
if (Array.isArray(data)) {
|
|
44
|
+
const jsonResults = data.filter(r => r.type === "json");
|
|
45
|
+
if (jsonResults.length > 0) {
|
|
46
|
+
json = jsonResults[0].value;
|
|
28
47
|
}
|
|
29
|
-
|
|
30
|
-
|
|
48
|
+
else {
|
|
49
|
+
try {
|
|
50
|
+
json = parseCompletionAsJson(data);
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
throw new ValidationError("json_error", error.message);
|
|
54
|
+
}
|
|
31
55
|
}
|
|
32
56
|
}
|
|
33
57
|
else {
|
|
34
|
-
|
|
58
|
+
throw new Error("Data to validate must be an array");
|
|
35
59
|
}
|
|
36
60
|
const validate = ajv.compile(schema);
|
|
37
61
|
const valid = validate(json);
|
|
@@ -59,6 +83,6 @@ export function validateResult(data, schema) {
|
|
|
59
83
|
throw new ValidationError("validation_error", errorsMessage);
|
|
60
84
|
}
|
|
61
85
|
}
|
|
62
|
-
return json;
|
|
86
|
+
return [{ type: "json", value: json }];
|
|
63
87
|
}
|
|
64
88
|
//# sourceMappingURL=validation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"validation.js","sourceRoot":"","sources":["../../src/validation.ts"],"names":[],"mappings":"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"}
|