@modelprofile.com/flexharness 10.15.0 → 10.15.1
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_ts/00_commitinfo_data.js +1 -1
- package/dist_ts_document/index.js +21 -8
- package/dist_ts_document/plugins.d.ts +2 -2
- package/dist_ts_document/plugins.js +3 -3
- package/dist_ts_media/index.js +14 -3
- package/dist_ts_media/plugins.d.ts +2 -2
- package/dist_ts_media/plugins.js +3 -3
- package/package.json +3 -3
- package/ts/00_commitinfo_data.ts +1 -1
- package/ts_document/index.ts +18 -7
- package/ts_document/plugins.ts +2 -2
- package/ts_document/readme.md +2 -0
- package/ts_media/index.ts +11 -2
- package/ts_media/plugins.ts +2 -2
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export const commitinfo = {
|
|
5
5
|
name: '@modelprofile.com/flexharness',
|
|
6
|
-
version: '10.15.
|
|
6
|
+
version: '10.15.1',
|
|
7
7
|
description: 'The FlexHarness toolbox source repository and shared dependency catalog.'
|
|
8
8
|
};
|
|
9
9
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiMDBfY29tbWl0aW5mb19kYXRhLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvMDBfY29tbWl0aW5mb19kYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sVUFBVSxHQUFHO0lBQ3hCLElBQUksRUFBRSwrQkFBK0I7SUFDckMsT0FBTyxFQUFFLFNBQVM7SUFDbEIsV0FBVyxFQUFFLDBFQUEwRTtDQUN4RixDQUFBIn0=
|
|
@@ -293,10 +293,10 @@ export async function analyzeDocumentsWithUsage(options) {
|
|
|
293
293
|
? plugins.wrapLanguageModel({
|
|
294
294
|
model: options.model,
|
|
295
295
|
middleware: {
|
|
296
|
-
|
|
296
|
+
wrapStream: async ({ doStream, params }) => {
|
|
297
297
|
modelCalls.start();
|
|
298
298
|
try {
|
|
299
|
-
return await
|
|
299
|
+
return await doStream();
|
|
300
300
|
}
|
|
301
301
|
catch (error) {
|
|
302
302
|
modelCalls.settle(params.abortSignal?.aborted ? 'aborted' : 'failed');
|
|
@@ -320,14 +320,20 @@ export async function analyzeDocumentsWithUsage(options) {
|
|
|
320
320
|
],
|
|
321
321
|
},
|
|
322
322
|
];
|
|
323
|
-
|
|
323
|
+
// The call is streamed: some providers, such as the ChatGPT Codex backend, refuse a call that is not.
|
|
324
|
+
let streamError;
|
|
325
|
+
let text = '';
|
|
326
|
+
let usage;
|
|
324
327
|
try {
|
|
325
|
-
result =
|
|
328
|
+
const result = plugins.streamText({
|
|
326
329
|
model,
|
|
327
330
|
instructions: options.systemMessage,
|
|
328
331
|
messages,
|
|
329
332
|
providerOptions: options.providerOptions,
|
|
330
333
|
abortSignal,
|
|
334
|
+
onError: ({ error }) => {
|
|
335
|
+
streamError ??= error;
|
|
336
|
+
},
|
|
331
337
|
...(modelCalls
|
|
332
338
|
? {
|
|
333
339
|
onLanguageModelCallEnd: ({ modelId, usage: callUsage }) => {
|
|
@@ -336,17 +342,24 @@ export async function analyzeDocumentsWithUsage(options) {
|
|
|
336
342
|
}
|
|
337
343
|
: {}),
|
|
338
344
|
});
|
|
345
|
+
for await (const delta of result.textStream)
|
|
346
|
+
text += delta;
|
|
347
|
+
// A stream that fails delivers its error to onError and ends, and an aborted stream just ends;
|
|
348
|
+
// either way the text is incomplete.
|
|
349
|
+
if (streamError !== undefined)
|
|
350
|
+
throw streamError;
|
|
351
|
+
abortSignal?.throwIfAborted();
|
|
352
|
+
usage = await result.totalUsage;
|
|
339
353
|
modelCalls?.settle('missing');
|
|
340
354
|
}
|
|
341
355
|
catch (error) {
|
|
342
356
|
modelCalls?.settle(abortSignal?.aborted ? 'aborted' : 'failed');
|
|
343
|
-
throw error;
|
|
357
|
+
throw streamError ?? error;
|
|
344
358
|
}
|
|
345
|
-
const usage = result.totalUsage;
|
|
346
359
|
const inputTokens = usage.inputTokens ?? 0;
|
|
347
360
|
const outputTokens = usage.outputTokens ?? 0;
|
|
348
361
|
return {
|
|
349
|
-
text
|
|
362
|
+
text,
|
|
350
363
|
usage: {
|
|
351
364
|
inputTokens,
|
|
352
365
|
outputTokens,
|
|
@@ -375,4 +388,4 @@ export async function stopSmartpdf() {
|
|
|
375
388
|
}
|
|
376
389
|
await instance.stop();
|
|
377
390
|
}
|
|
378
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts_document/index.ts"],"names":[],"mappings":"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"}
|
|
391
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../ts_document/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { streamText, wrapLanguageModel } from 'ai';
|
|
2
2
|
import * as smartpdf from '@push.rocks/smartpdf';
|
|
3
3
|
import { AgentModelCallUsageRecorder } from '@modelprofile.com/flexharness-agent';
|
|
4
|
-
export {
|
|
4
|
+
export { streamText, wrapLanguageModel, smartpdf, AgentModelCallUsageRecorder };
|
|
5
5
|
export type { ModelMessage } from 'ai';
|
|
6
6
|
export type { TSmartAiLanguageModel, TSmartAiProviderOptions } from '@modelprofile.com/flexharness-models';
|
|
7
7
|
export type { TAgentModelCallUsageReporter } from '@modelprofile.com/flexharness-agent';
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { streamText, wrapLanguageModel } from 'ai';
|
|
2
2
|
import * as smartpdf from '@push.rocks/smartpdf';
|
|
3
3
|
import { AgentModelCallUsageRecorder } from '@modelprofile.com/flexharness-agent';
|
|
4
|
-
export {
|
|
4
|
+
export { streamText, wrapLanguageModel, smartpdf, AgentModelCallUsageRecorder };
|
|
5
5
|
/** Loads sharp and hands out its reader. */
|
|
6
6
|
export const importSharp = async () => {
|
|
7
7
|
const sharp = (await import('sharp')).default;
|
|
8
8
|
return (input, options) => sharp(input, options);
|
|
9
9
|
};
|
|
10
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
10
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX2RvY3VtZW50L3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxpQkFBaUIsRUFBRSxNQUFNLElBQUksQ0FBQztBQUNuRCxPQUFPLEtBQUssUUFBUSxNQUFNLHNCQUFzQixDQUFDO0FBQ2pELE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLHFDQUFxQyxDQUFDO0FBQ2xGLE9BQU8sRUFBRSxVQUFVLEVBQUUsaUJBQWlCLEVBQUUsUUFBUSxFQUFFLDJCQUEyQixFQUFFLENBQUM7QUFrQ2hGLDRDQUE0QztBQUM1QyxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsS0FBSyxJQUEyQixFQUFFO0lBQzNELE1BQU0sS0FBSyxHQUFHLENBQUMsTUFBTSxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUM7SUFDOUMsT0FBTyxDQUFDLEtBQUssRUFBRSxPQUFPLEVBQUUsRUFBRSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsT0FBTyxDQUFDLENBQUM7QUFDbkQsQ0FBQyxDQUFDIn0=
|
package/dist_ts_media/index.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import * as plugins from './plugins.js';
|
|
2
2
|
export async function analyzeImage(options) {
|
|
3
|
-
|
|
3
|
+
// The call is streamed: some providers, such as the ChatGPT Codex backend, refuse a call that is not.
|
|
4
|
+
let streamError;
|
|
5
|
+
const result = plugins.streamText({
|
|
4
6
|
model: options.model,
|
|
5
7
|
messages: [
|
|
6
8
|
{
|
|
@@ -15,7 +17,16 @@ export async function analyzeImage(options) {
|
|
|
15
17
|
],
|
|
16
18
|
},
|
|
17
19
|
],
|
|
20
|
+
onError: ({ error }) => {
|
|
21
|
+
streamError ??= error;
|
|
22
|
+
},
|
|
18
23
|
});
|
|
19
|
-
|
|
24
|
+
let text = '';
|
|
25
|
+
for await (const delta of result.textStream)
|
|
26
|
+
text += delta;
|
|
27
|
+
// A stream that fails delivers its error to onError and ends; its text is incomplete.
|
|
28
|
+
if (streamError !== undefined)
|
|
29
|
+
throw streamError;
|
|
30
|
+
return text;
|
|
20
31
|
}
|
|
21
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90c19tZWRpYS9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssT0FBTyxNQUFNLGNBQWMsQ0FBQztBQVN4QyxNQUFNLENBQUMsS0FBSyxVQUFVLFlBQVksQ0FBQyxPQUF1QjtJQUN4RCxzR0FBc0c7SUFDdEcsSUFBSSxXQUFvQixDQUFDO0lBQ3pCLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUM7UUFDaEMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxLQUFLO1FBQ3BCLFFBQVEsRUFBRTtZQUNSO2dCQUNFLElBQUksRUFBRSxNQUFNO2dCQUNaLE9BQU8sRUFBRTtvQkFDUCxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxNQUFNLEVBQUU7b0JBQ3RDO3dCQUNFLElBQUksRUFBRSxNQUFNO3dCQUNaLElBQUksRUFBRSxPQUFPLENBQUMsS0FBSzt3QkFDbkIsU0FBUyxFQUFFLE9BQU8sQ0FBQyxTQUFTLElBQUksWUFBWTtxQkFDN0M7aUJBQ0Y7YUFDRjtTQUNGO1FBQ0QsT0FBTyxFQUFFLENBQUMsRUFBRSxLQUFLLEVBQUUsRUFBRSxFQUFFO1lBQ3JCLFdBQVcsS0FBSyxLQUFLLENBQUM7UUFDeEIsQ0FBQztLQUNGLENBQUMsQ0FBQztJQUNILElBQUksSUFBSSxHQUFHLEVBQUUsQ0FBQztJQUNkLElBQUksS0FBSyxFQUFFLE1BQU0sS0FBSyxJQUFJLE1BQU0sQ0FBQyxVQUFVO1FBQUUsSUFBSSxJQUFJLEtBQUssQ0FBQztJQUMzRCxzRkFBc0Y7SUFDdEYsSUFBSSxXQUFXLEtBQUssU0FBUztRQUFFLE1BQU0sV0FBVyxDQUFDO0lBQ2pELE9BQU8sSUFBSSxDQUFDO0FBQ2QsQ0FBQyJ9
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export {
|
|
1
|
+
import { streamText } from 'ai';
|
|
2
|
+
export { streamText };
|
|
3
3
|
export type { TSmartAiLanguageModel } from '@modelprofile.com/flexharness-models';
|
package/dist_ts_media/plugins.js
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export {
|
|
3
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
1
|
+
import { streamText } from 'ai';
|
|
2
|
+
export { streamText };
|
|
3
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzX21lZGlhL3BsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLElBQUksQ0FBQztBQUNoQyxPQUFPLEVBQUUsVUFBVSxFQUFFLENBQUMifQ==
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
"author": "Task Venture Capital GmbH",
|
|
3
3
|
"license": "MIT",
|
|
4
4
|
"name": "@modelprofile.com/flexharness",
|
|
5
|
-
"version": "10.15.
|
|
5
|
+
"version": "10.15.1",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"description": "Managed agent sessions with tools, MCP, chat, OCR, documents and browser control through focused subpath imports.",
|
|
8
8
|
"main": "./dist_ts/index.js",
|
|
@@ -75,8 +75,8 @@
|
|
|
75
75
|
},
|
|
76
76
|
"dependencies": {
|
|
77
77
|
"@cfworker/json-schema": "^4.1.1",
|
|
78
|
-
"@modelprofile.com/flexharness-agent": "10.15.
|
|
79
|
-
"@modelprofile.com/flexharness-models": "10.15.
|
|
78
|
+
"@modelprofile.com/flexharness-agent": "10.15.1",
|
|
79
|
+
"@modelprofile.com/flexharness-models": "10.15.1",
|
|
80
80
|
"@push.rocks/smartrequest": "^5.5.1",
|
|
81
81
|
"ai": "^7.0.111",
|
|
82
82
|
"zod": "^4.6.5"
|
package/ts/00_commitinfo_data.ts
CHANGED
package/ts_document/index.ts
CHANGED
|
@@ -489,10 +489,10 @@ export async function analyzeDocumentsWithUsage(options: IDocumentOptions): Prom
|
|
|
489
489
|
? plugins.wrapLanguageModel({
|
|
490
490
|
model: options.model,
|
|
491
491
|
middleware: {
|
|
492
|
-
|
|
492
|
+
wrapStream: async ({ doStream, params }) => {
|
|
493
493
|
modelCalls.start();
|
|
494
494
|
try {
|
|
495
|
-
return await
|
|
495
|
+
return await doStream();
|
|
496
496
|
} catch (error) {
|
|
497
497
|
modelCalls.settle(params.abortSignal?.aborted ? 'aborted' : 'failed');
|
|
498
498
|
throw error;
|
|
@@ -515,14 +515,20 @@ export async function analyzeDocumentsWithUsage(options: IDocumentOptions): Prom
|
|
|
515
515
|
],
|
|
516
516
|
},
|
|
517
517
|
];
|
|
518
|
-
|
|
518
|
+
// The call is streamed: some providers, such as the ChatGPT Codex backend, refuse a call that is not.
|
|
519
|
+
let streamError: unknown;
|
|
520
|
+
let text = '';
|
|
521
|
+
let usage: Awaited<ReturnType<typeof plugins.streamText>['totalUsage']>;
|
|
519
522
|
try {
|
|
520
|
-
result =
|
|
523
|
+
const result = plugins.streamText({
|
|
521
524
|
model,
|
|
522
525
|
instructions: options.systemMessage,
|
|
523
526
|
messages,
|
|
524
527
|
providerOptions: options.providerOptions,
|
|
525
528
|
abortSignal,
|
|
529
|
+
onError: ({ error }) => {
|
|
530
|
+
streamError ??= error;
|
|
531
|
+
},
|
|
526
532
|
...(modelCalls
|
|
527
533
|
? {
|
|
528
534
|
onLanguageModelCallEnd: ({ modelId, usage: callUsage }) => {
|
|
@@ -531,16 +537,21 @@ export async function analyzeDocumentsWithUsage(options: IDocumentOptions): Prom
|
|
|
531
537
|
}
|
|
532
538
|
: {}),
|
|
533
539
|
});
|
|
540
|
+
for await (const delta of result.textStream) text += delta;
|
|
541
|
+
// A stream that fails delivers its error to onError and ends, and an aborted stream just ends;
|
|
542
|
+
// either way the text is incomplete.
|
|
543
|
+
if (streamError !== undefined) throw streamError;
|
|
544
|
+
abortSignal?.throwIfAborted();
|
|
545
|
+
usage = await result.totalUsage;
|
|
534
546
|
modelCalls?.settle('missing');
|
|
535
547
|
} catch (error) {
|
|
536
548
|
modelCalls?.settle(abortSignal?.aborted ? 'aborted' : 'failed');
|
|
537
|
-
throw error;
|
|
549
|
+
throw streamError ?? error;
|
|
538
550
|
}
|
|
539
|
-
const usage = result.totalUsage;
|
|
540
551
|
const inputTokens = usage.inputTokens ?? 0;
|
|
541
552
|
const outputTokens = usage.outputTokens ?? 0;
|
|
542
553
|
return {
|
|
543
|
-
text
|
|
554
|
+
text,
|
|
544
555
|
usage: {
|
|
545
556
|
inputTokens,
|
|
546
557
|
outputTokens,
|
package/ts_document/plugins.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { streamText, wrapLanguageModel } from 'ai';
|
|
2
2
|
import * as smartpdf from '@push.rocks/smartpdf';
|
|
3
3
|
import { AgentModelCallUsageRecorder } from '@modelprofile.com/flexharness-agent';
|
|
4
|
-
export {
|
|
4
|
+
export { streamText, wrapLanguageModel, smartpdf, AgentModelCallUsageRecorder };
|
|
5
5
|
export type { ModelMessage } from 'ai';
|
|
6
6
|
export type { TSmartAiLanguageModel, TSmartAiProviderOptions } from '@modelprofile.com/flexharness-models';
|
|
7
7
|
export type { TAgentModelCallUsageReporter } from '@modelprofile.com/flexharness-agent';
|
package/ts_document/readme.md
CHANGED
|
@@ -67,6 +67,8 @@ Both functions accept these request options:
|
|
|
67
67
|
- `maxImageEdge` is the longest edge, in pixels, of an image document as it is sent; see above.
|
|
68
68
|
- `onUsage` receives the usage of each model call of the request, also of a request that fails or is aborted; see [Usage of a request that fails or is aborted](#usage-of-a-request-that-fails-or-is-aborted).
|
|
69
69
|
|
|
70
|
+
A request makes one streamed model call, retries aside, so it also reads documents on providers that answer streamed calls only, such as the Codex backend of a ChatGPT account.
|
|
71
|
+
|
|
70
72
|
`extractTextFromPdfWithUsage` and `analyzeDocumentsWithUsage` take the same arguments and return `{ text, usage, pageCount }`. `usage` has the shape of an agent run's usage (`inputTokens`, `outputTokens`, `totalTokens`, `cacheReadTokens`, `cacheWriteTokens`), summed over the request's model steps, with usage the provider leaves out counted as zero; `pageCount` is the number of rendered pages sent to the model.
|
|
71
73
|
|
|
72
74
|
```typescript
|
package/ts_media/index.ts
CHANGED
|
@@ -8,7 +8,9 @@ export interface IVisionOptions {
|
|
|
8
8
|
}
|
|
9
9
|
|
|
10
10
|
export async function analyzeImage(options: IVisionOptions): Promise<string> {
|
|
11
|
-
|
|
11
|
+
// The call is streamed: some providers, such as the ChatGPT Codex backend, refuse a call that is not.
|
|
12
|
+
let streamError: unknown;
|
|
13
|
+
const result = plugins.streamText({
|
|
12
14
|
model: options.model,
|
|
13
15
|
messages: [
|
|
14
16
|
{
|
|
@@ -23,6 +25,13 @@ export async function analyzeImage(options: IVisionOptions): Promise<string> {
|
|
|
23
25
|
],
|
|
24
26
|
},
|
|
25
27
|
],
|
|
28
|
+
onError: ({ error }) => {
|
|
29
|
+
streamError ??= error;
|
|
30
|
+
},
|
|
26
31
|
});
|
|
27
|
-
|
|
32
|
+
let text = '';
|
|
33
|
+
for await (const delta of result.textStream) text += delta;
|
|
34
|
+
// A stream that fails delivers its error to onError and ends; its text is incomplete.
|
|
35
|
+
if (streamError !== undefined) throw streamError;
|
|
36
|
+
return text;
|
|
28
37
|
}
|
package/ts_media/plugins.ts
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export {
|
|
1
|
+
import { streamText } from 'ai';
|
|
2
|
+
export { streamText };
|
|
3
3
|
export type { TSmartAiLanguageModel } from '@modelprofile.com/flexharness-models';
|